From 46f085e73a50962b0148676be4381241381b869b Mon Sep 17 00:00:00 2001 From: Arfrever Frehtes Taifersar Arahesis Date: Sun, 20 Sep 2009 16:41:30 +0000 Subject: Support print() function with Python 2 in more files. svn path=/main/trunk/; revision=14295 --- pym/_emerge/Scheduler.py | 2 ++ pym/_emerge/actions.py | 2 ++ pym/_emerge/countdown.py | 2 ++ pym/_emerge/depgraph.py | 2 ++ pym/_emerge/emergelog.py | 2 ++ pym/_emerge/help.py | 2 ++ pym/_emerge/main.py | 2 ++ pym/_emerge/search.py | 2 ++ pym/_emerge/unmerge.py | 2 ++ pym/_emerge/userquery.py | 2 ++ pym/portage/__init__.py | 2 ++ pym/portage/cache/util.py | 2 ++ pym/portage/cvstree.py | 2 ++ pym/portage/dbapi/porttree.py | 2 ++ pym/portage/dbapi/vartree.py | 2 ++ pym/portage/dispatch_conf.py | 2 ++ pym/portage/elog/mod_echo.py | 2 ++ pym/portage/sets/__init__.py | 2 ++ pym/portage/sets/libs.py | 2 ++ 19 files changed, 38 insertions(+) (limited to 'pym') diff --git a/pym/_emerge/Scheduler.py b/pym/_emerge/Scheduler.py index 4655be7ff..337a14f61 100644 --- 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 fda9f3d81..7366b82c7 100644 --- 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 28352ff43..12c3e2c07 100644 --- 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 5d90ff0fb..33cb7b5ee 100644 --- 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 5b026bf6c..dbb0812ff 100644 --- 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 6e634f0cd..f34691682 100644 --- 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 950314662..2ed7667ef 100644 --- 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 1b43fbb80..82c49b39c 100644 --- 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 f9ad50606..bb6224fe7 100644 --- 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 9a62551df..db8cc4c79 100644 --- 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 deb7b2ff9..aa7520edd 100644 --- 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 8eee5971d..55bcb015c 100644 --- 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 de448fdd1..1ecffa493 100644 --- 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 9a1d65746..b46abb2cc 100644 --- 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 00a683129..74d12c99a 100644 --- 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", "vardbapi", "vartree", "dblink"] + \ ["write_contents", "tar_contents"] diff --git a/pym/portage/dispatch_conf.py b/pym/portage/dispatch_conf.py index 971f9eb5f..096ce0a7c 100644 --- a/pym/portage/dispatch_conf.py +++ b/pym/portage/dispatch_conf.py @@ -7,6 +7,8 @@ # Library by Wayne Davison , 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 f699e630c..28d77649e 100644 --- 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 20923ca2e..c617efc3a 100644 --- 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 ede122725..d7e4c731a 100644 --- 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 -- cgit v1.2.3-1-g7c22