Merged from trunk -r14290:14291

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

svn path=/main/branches/prefix/; revision=14337

diff --git a/bin/archive-conf b/bin/archive-conf
index d76707b5f5a58a5a69583e7447fc3735acc4034a..ce6a607a23845be472375d2ad579f2c3ef282754 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
 
 from portage import os

diff --git a/bin/check-implicit-pointer-usage.py b/bin/check-implicit-pointer-usage.py
index 24277e08115f2203801336573fd5c4db5a84b3fd..844ea8184dcda70ee7711821dc51fe3be13fe084 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 b657f750bac1993ab1beab4fac73088e40fb8297..8c5270677c57521644e5140da2196194865790e8 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
 # for an explanation on this logic, see pym/_emerge/__init__.py
 from os import environ as ose

diff --git a/bin/dispatch-conf b/bin/dispatch-conf
index 81ef88fc5392af4bf33ef24093dc5aa22243db03..a86d9fdf4eace1985a71b94f07dda76ec7d2975f 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 4564dded1aa5b1ac475c502d4ea415481902def9..ac5781ef8555ab673c01310cb1ae929bc29f3a14 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 d3d9f9e55e793a692b8cd0d6cf68fd71e49a07e2..39e7ab10784a36f1cf48524bde37bf0e091cc400 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 98d20c25ee6d7b2ccbf585ecbe46c4406c64008a..d6e69b042d60e9c2d00f594091dd34819d83b454 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 c070c326668b8bbd88a85db1887732b3ab49c673..580447c48a919b08cc765fed116d249c1aacc143 100755 (executable)
--- a/bin/emaint
+++ b/bin/emaint
@@ -1,5 +1,8 @@
 #!@PORTAGE_PYTHON@ -O
 # vim: noet :
+
+from __future__ import print_function
+
 import re
 import signal
 import sys

diff --git a/bin/emerge b/bin/emerge
index eabc1d24acba397c1a59da2512eebd3fc770879f..05ed9ae91de9d4031b5912daf8d4e1f90a04b02a 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -3,7 +3,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-import os
+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 43abef500a056a373afaf4e13e3e8865cf5d7f88..73bb2b39ed466d2b2d2b9c9e248ecc5336608d38 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 5758074c696a466d3ca2226c32bd766c02bb4a5e..140eda4bb4a9f4be5200e90efd7bc536349291b5 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"
 

diff --git a/bin/glsa-check b/bin/glsa-check
index c1def7275ee895c0f48a73e108ad2eea9d618720..21f33ba17f9be129fbb8a4af9de1042b404ad8c2 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
 
 # for an explanation on this logic, see pym/_emerge/__init__.py

diff --git a/bin/portageq b/bin/portageq
index a3b1c35064274d24dc310e57e6de735a193e609e..f197db69ed0c77797d09bddc66f9c5f5c30d2423 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 cad838932e8e3826acf5a8a492f005cc538e6fbd..e15f4b28935de003875b567720165c8144a9acbe 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
 
 from os import environ as ose

diff --git a/bin/regenworld b/bin/regenworld
index a0b9337fbb17ca0b6495b01444c92e13884ce364..f4cd445f4938e498afc293b4393679efba6e209d 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
 # for an explanation on this logic, see pym/_emerge/__init__.py 
 from os import environ as ose

diff --git a/bin/repoman b/bin/repoman
index d7db51ea2417361b08adf4e2106b4db6cbafaad9..a0fd91efd0193781112e4ff99e8809903774e93e 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 3bf8e3d3e46e2979fb72911f7ed7380af25ade5a..57e23f583594955ef49f712c0556d0ba8c55e5fb 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