Merged from trunk -r14294:14295

   | 14295    | Support print() function with Python 2 in more files.       |
   | arfrever |                                                             |

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

diff --git a/pym/_emerge/Scheduler.py b/pym/_emerge/Scheduler.py
index 4655be7ffebaa62916a72ae7101c58a690b14c29..337a14f6151ed38b2b8958d1a9b1e71c742663a5 100644 (file)
--- a/pym/_emerge/Scheduler.py
+++ b/pym/_emerge/Scheduler.py
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+from __future__ import print_function
+
 import codecs
 import logging
 import sys

diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py
index 062edd3f8ed73bf2fb769358d422b4b0f34d3430..58139d3a6b4f881deec498633c72c9079c2d6bbe 100644 (file)
--- a/pym/_emerge/actions.py
+++ b/pym/_emerge/actions.py
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+from __future__ import print_function
+
 try:
        from subprocess import getstatusoutput as subprocess_getstatusoutput
 except ImportError:

diff --git a/pym/_emerge/countdown.py b/pym/_emerge/countdown.py
index 28352ff434c68ac36c8a04d54dc654b423cf4d25..12c3e2c07f878465bb1b43f5e2f5fe98b35cc2bd 100644 (file)
--- a/pym/_emerge/countdown.py
+++ b/pym/_emerge/countdown.py
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+from __future__ import print_function
+
 import sys
 import time
 

diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 0aba9f53a12a403d8751ac191420e5049f9ef3b6..1d5f3808397ffe59907780d667626863a0eb0800 100644 (file)
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+from __future__ import print_function
+
 import gc
 import logging
 import re

diff --git a/pym/_emerge/emergelog.py b/pym/_emerge/emergelog.py
index ef6cb4bbe0ab8df7ae277901b312c3c143f0b0fc..e7b1f49d792e6234967f02741e98006b7bbaff3a 100644 (file)
--- a/pym/_emerge/emergelog.py
+++ b/pym/_emerge/emergelog.py
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+from __future__ import print_function
+
 import codecs
 import sys
 import time

diff --git a/pym/_emerge/help.py b/pym/_emerge/help.py
index 6e634f0cdd4e00bfac9227858ed74c2a50e84a39..f34691682f8fbd9a1ab9c404ad6710bfca77ae86 100644 (file)
--- a/pym/_emerge/help.py
+++ b/pym/_emerge/help.py
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+from __future__ import print_function
+
 from portage.output import bold, turquoise, green
 
 def shorthelp():

diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py
index 3b0bec44d8a8aff426761cf753d5634f6eb4451d..839f40e1c20a0e504a16c19b7a6a64b11954aeda 100644 (file)
--- a/pym/_emerge/main.py
+++ b/pym/_emerge/main.py
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+from __future__ import print_function
+
 import logging
 import signal
 import sys

diff --git a/pym/_emerge/search.py b/pym/_emerge/search.py
index 1b43fbb8009e8852d47ea90cc094f0f02935b987..82c49b39c4c8892d5040560a8a425c0f03e855fa 100644 (file)
--- a/pym/_emerge/search.py
+++ b/pym/_emerge/search.py
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+from __future__ import print_function
+
 import re
 from itertools import izip
 import portage

diff --git a/pym/_emerge/unmerge.py b/pym/_emerge/unmerge.py
index f9ad5060634874c2e9eb378875575ceccaf6a2c3..bb6224fe7c6a6e995b42a19380d71db5d1895d78 100644 (file)
--- a/pym/_emerge/unmerge.py
+++ b/pym/_emerge/unmerge.py
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+from __future__ import print_function
+
 import logging
 import sys
 import textwrap

diff --git a/pym/_emerge/userquery.py b/pym/_emerge/userquery.py
index 9a62551df6be796daec6bb72245044fe83f93a21..db8cc4c792107d60e4e15819700b99650668c3aa 100644 (file)
--- a/pym/_emerge/userquery.py
+++ b/pym/_emerge/userquery.py
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+from __future__ import print_function
+
 import sys
 
 from portage.output import bold, create_color_func

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index ae0187198f1c89fac619bd1bd8a2891c209c8047..df4ab5c273a8e7e5460416156abdc3411607cbb5 100644 (file)
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -10,6 +10,8 @@ VERSION="$Rev$"[6:-2] + "-svn"
 # START OF IMPORTS -- START OF IMPORTS -- START OF IMPORTS -- START OF IMPORT
 # ===========================================================================
 
+from __future__ import print_function
+
 try:
        import sys
        import codecs

diff --git a/pym/portage/cache/util.py b/pym/portage/cache/util.py
index 8eee5971d1e03160b0cbb6a9715e6d74578460b7..55bcb015ca6755ec6e08320a37867459c01c52b1 100644 (file)
--- a/pym/portage/cache/util.py
+++ b/pym/portage/cache/util.py
@@ -3,6 +3,8 @@
 # License: GPL2
 # $Id$
 
+from __future__ import print_function
+
 __all__ = ["mirror_cache", "non_quiet_mirroring", "quiet_mirroring"]
 
 from itertools import chain

diff --git a/pym/portage/cvstree.py b/pym/portage/cvstree.py
index de448fdd1c99136279afe2e815b06354076ecd09..1ecffa493486aecc4aedc8f4c8c1b6b53252a321 100644 (file)
--- a/pym/portage/cvstree.py
+++ b/pym/portage/cvstree.py
@@ -3,6 +3,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+from __future__ import print_function
+
 import codecs
 import re
 import time

diff --git a/pym/portage/dbapi/porttree.py b/pym/portage/dbapi/porttree.py
index 9a1d6574635e474efb45f7d8409612ca69661c93..b46abb2cc01c0813edb833fe29846a7d54be2693 100644 (file)
--- a/pym/portage/dbapi/porttree.py
+++ b/pym/portage/dbapi/porttree.py
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+from __future__ import print_function
+
 __all__ = ["portdbapi", "close_portdbapi_caches", "portagetree"]
 
 import portage

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index e5234201b12234a1fee3e07794931743ee8eb237..a08b1eb6e855365c84408fdb77199fea2b0011bd 100644 (file)
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+from __future__ import print_function
+
 __all__ = ["PreservedLibsRegistry", "LinkageMap",
        "LinkageMapMachO", "LinkageMapPeCoff",
        "vardbapi", "vartree", "dblink"] + \

diff --git a/pym/portage/dispatch_conf.py b/pym/portage/dispatch_conf.py
index e182f151a7a5a72cc5d614440eb566b539d1e324..88fea8bd3596e12f8aebb0493ba69d9f597b9122 100644 (file)
--- a/pym/portage/dispatch_conf.py
+++ b/pym/portage/dispatch_conf.py
@@ -7,6 +7,8 @@
 # Library by Wayne Davison <gentoo@blorf.net>, derived from code
 # written by Jeremy Wohl (http://igmus.org)
 
+from __future__ import print_function
+
 import os, sys, shutil
 try:
        from subprocess import getoutput as subprocess_getoutput

diff --git a/pym/portage/elog/mod_echo.py b/pym/portage/elog/mod_echo.py
index f699e630c5d13f0c1c682131bb7d149039009a56..28d77649e489ec7668a0f9c2dbfb3b7da1d38aa3 100644 (file)
--- a/pym/portage/elog/mod_echo.py
+++ b/pym/portage/elog/mod_echo.py
@@ -3,6 +3,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+from __future__ import print_function
+
 from portage.output import EOutput, colorize
 from portage.const import EBUILD_PHASES
 from portage.localization import _

diff --git a/pym/portage/sets/__init__.py b/pym/portage/sets/__init__.py
index 20923ca2ebc38980902ccc530696ca47deb1427e..c617efc3a5a2fe43b9db4ad7d5afb0ba902e74b2 100644 (file)
--- a/pym/portage/sets/__init__.py
+++ b/pym/portage/sets/__init__.py
@@ -5,6 +5,8 @@
 __all__ = ["SETPREFIX", "get_boolean", "SetConfigError",
        "SetConfig", "load_default_config"]
 
+from __future__ import print_function
+
 try:
        from configparser import SafeConfigParser, NoOptionError
 except ImportError:

diff --git a/pym/portage/sets/libs.py b/pym/portage/sets/libs.py
index ede1227255e008478f89b69236362d86d97d314e..d7e4c731a77971d65998e14bdb166bdff503a645 100644 (file)
--- a/pym/portage/sets/libs.py
+++ b/pym/portage/sets/libs.py
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+from __future__ import print_function
+
 from portage.localization import _
 from portage.sets.base import PackageSet
 from portage.sets import get_boolean