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

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

17 files changed, 40 insertions, 2 deletions

diff --git a/bin/archive-conf b/bin/archive-conf
index 227bcece..8a028f9b 100755
--- 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 c50424b8..65b0d122 100755
--- 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 eaeedda3..95698322 100755
--- 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 2ef55a90..f2228d37 100755
--- 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 fa7c3d53..43beb314 100755
--- 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 f672a9a0..71cbb629 100755
--- 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 6c46896c..3af060ef 100755
--- 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 2dd6d140..56a6617b 100755
--- 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 fca852d0..522135fc 100755
--- 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 912602f7..396dc447 100755
--- 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 a85277f0..50135345 100755
--- 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 d1fdb207..6516a1d9 100755
--- 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 0e26be01..6a0ec5eb 100755
--- 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 496a6832..f885fff0 100755
--- 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 ae359cf3..de082db4 100755
--- 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 52f15780..2f0068cc 100755
--- 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 55e07c51..5f42e29d 100755
--- 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