Support print() function with Python 2 in some files.

svn path=/main/trunk/; revision=14291

diff --git a/bin/archive-conf b/bin/archive-conf
index 227bcece2c6f1202cbb66ef4e7e52c67080709db..8a028f9b0d98263780a53a5fb5562be590de1f48 100755 (executable)
--- a/bin/archive-conf
+++ b/bin/archive-conf
@@ -10,6 +10,8 @@
 #  Jeremy Wohl's dispatch-conf script and the portage chkcontents script.
 #
 
+from __future__ import print_function
+
 import sys
 try:
     import portage

diff --git a/bin/check-implicit-pointer-usage.py b/bin/check-implicit-pointer-usage.py
index c50424b830d3668f5a2e74d8c828b377efc5b587..65b0d12286d14c26c1d72b343e5f284fbcfe3e32 100755 (executable)
--- a/bin/check-implicit-pointer-usage.py
+++ b/bin/check-implicit-pointer-usage.py
@@ -13,6 +13,9 @@
 # interpreted as pointers.  Those are almost guaranteed to cause
 # crashes.
 #
+
+from __future__ import print_function
+
 import re
 import sys
 

diff --git a/bin/clean_locks b/bin/clean_locks
index eaeedda333628954f4a6d92eb84cc8c7d0d2029d..95698322c58ffd5af21a611c3c593058faece776 100755 (executable)
--- a/bin/clean_locks
+++ b/bin/clean_locks
@@ -3,6 +3,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+from __future__ import print_function
+
 import sys, errno
 try:
        import portage

diff --git a/bin/dispatch-conf b/bin/dispatch-conf
index 2ef55a9082d637b6672ab678b7d63ba8b0123b04..f2228d37c732dd1ce1c23259a25d15946b69ba94 100755 (executable)
--- a/bin/dispatch-conf
+++ b/bin/dispatch-conf
@@ -12,6 +12,8 @@
 #  dialog menus
 #
 
+from __future__ import print_function
+
 if not hasattr(__builtins__, "set"):
     from sets import Set as set
 

diff --git a/bin/ebuild b/bin/ebuild
index fa7c3d5360588b6508daaaa0e3ed7c124dec4c4e..43beb314981b0931729142d5843208a94bdd9869 100755 (executable)
--- a/bin/ebuild
+++ b/bin/ebuild
@@ -3,6 +3,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+from __future__ import print_function
+
 import sys
 # This block ensures that ^C interrupts are handled quietly.
 try:

diff --git a/bin/ebuild-helpers/dohtml b/bin/ebuild-helpers/dohtml
index f672a9a0cc60ee3a7f9702ac00283ad12bffa8f5..71cbb62934a3738ea7fff6281f91fa5314faa0c9 100755 (executable)
--- a/bin/ebuild-helpers/dohtml
+++ b/bin/ebuild-helpers/dohtml
@@ -29,6 +29,8 @@
 #  - will do as 'dohtml -r', but ignore directories named CVS, SCCS, RCS
 #
 
+from __future__ import print_function
+
 import os
 import sys
 

diff --git a/bin/egencache b/bin/egencache
index 6c46896c04ca1ad04e72c455d295574b8c645702..3af060ef8f0ef0c837ab186e9f4c21156000324c 100755 (executable)
--- a/bin/egencache
+++ b/bin/egencache
@@ -3,6 +3,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+from __future__ import print_function
+
 import sys
 # This block ensures that ^C interrupts are handled quietly.
 try:

diff --git a/bin/emaint b/bin/emaint
index 2dd6d14079147616b180eca3ed6c0046ec24eaad..56a6617b08f76f0a4e1afdff0d8c61194a0866dc 100755 (executable)
--- a/bin/emaint
+++ b/bin/emaint
@@ -1,5 +1,8 @@
 #!/usr/bin/python -O
 # vim: noet :
+
+from __future__ import print_function
+
 import re
 import signal
 import sys

diff --git a/bin/emerge b/bin/emerge
index fca852d0269527324048467179f1e81892116e09..522135fcd8f9a7d79eb21c8ddc4efa39ffa997ee 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -3,6 +3,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+from __future__ import print_function
+
 import sys
 # This block ensures that ^C interrupts are handled quietly.
 try:

diff --git a/bin/env-update b/bin/env-update
index 912602f7bb348d317f8c7495b0d10ed355dfa307..396dc4471303e20bede9b39bc8299db7226a886d 100755 (executable)
--- a/bin/env-update
+++ b/bin/env-update
@@ -3,7 +3,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-import sys, errno
+from __future__ import print_function
+
+import errno
+import sys
 
 def usage(status):
        print("Usage: env-update [--no-ldconfig]")

diff --git a/bin/fixpackages b/bin/fixpackages
index a85277f0e0902b4fab105b5ef9f438a128f9725d..50135345aa6270ae94f110bea0f714c9336e5724 100755 (executable)
--- a/bin/fixpackages
+++ b/bin/fixpackages
@@ -3,6 +3,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+from __future__ import print_function
+
 import os,sys
 os.environ["PORTAGE_CALLER"]="fixpackages"
 try:

diff --git a/bin/glsa-check b/bin/glsa-check
index d1fdb207038615537515809563857cdfa22face7..6516a1d91248914180c568406ba34d703735ae7d 100755 (executable)
--- a/bin/glsa-check
+++ b/bin/glsa-check
@@ -3,6 +3,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+from __future__ import print_function
+
 import sys
 
 try:

diff --git a/bin/portageq b/bin/portageq
index 0e26be01cd39ceabfa62462a76dc9c3fe32cdd9b..6a0ec5eb03ad251bd0ad249f300e41cabd643314 100755 (executable)
--- a/bin/portageq
+++ b/bin/portageq
@@ -3,6 +3,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+from __future__ import print_function
+
 import sys
 # This block ensures that ^C interrupts are handled quietly.
 try:

diff --git a/bin/quickpkg b/bin/quickpkg
index 496a68325d3959b3967f908577c074dcbd65d833..f885fff057813c5e90b9a79e552c1c23c9a255a3 100755 (executable)
--- a/bin/quickpkg
+++ b/bin/quickpkg
@@ -3,7 +3,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-import errno, signal, sys
+from __future__ import print_function
+
+import errno
+import signal
+import sys
 from itertools import izip
 
 try:

diff --git a/bin/regenworld b/bin/regenworld
index ae359cf38676fb24e5c6522b4f0c54ec03347eb0..de082db412e0c6fbc88002ce3528926f5ae111ea 100755 (executable)
--- a/bin/regenworld
+++ b/bin/regenworld
@@ -5,6 +5,8 @@
 
 # NOTE: this file does not respect ROOT
 
+from __future__ import print_function
+
 import sys
 try:
        import portage

diff --git a/bin/repoman b/bin/repoman
index 52f15780c684be7506b7a3debf06a4b4fa192198..2f0068ccd85d00c3e4fa5ea7bab37e43ff35cb07 100755 (executable)
--- a/bin/repoman
+++ b/bin/repoman
@@ -7,6 +7,8 @@
 # Then, check to make sure deps are satisfiable (to avoid "can't find match for" problems)
 # that last one is tricky because multiple profiles need to be checked.
 
+from __future__ import print_function
+
 import codecs
 import commands
 import errno

diff --git a/pym/portage/tests/runTests b/pym/portage/tests/runTests
index 55e07c5148983d4f55d5b038dce6e7b8ed8e341d..5f42e29dc216ec7d92a73fa153993f41af01c298 100755 (executable)
--- a/pym/portage/tests/runTests
+++ b/pym/portage/tests/runTests
@@ -4,6 +4,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+from __future__ import print_function
 
 import os, sys
 import os.path as osp