From: Fabian Groffen Date: Mon, 21 Sep 2009 17:39:25 +0000 (-0000) Subject: Merged from trunk -r14295:14296 X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=5f789ade68829943b5b3f68998aed4b698a44fa5;p=portage.git Merged from trunk -r14295:14296 | 14296 | Fix position of imports from __future__. | | arfrever | | svn path=/main/branches/prefix/; revision=14341 --- diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index df4ab5c27..b95205945 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -3,6 +3,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ +from __future__ import print_function VERSION="$Rev$"[6:-2] + "-svn" @@ -10,8 +11,6 @@ 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/sets/__init__.py b/pym/portage/sets/__init__.py index c617efc3a..01ce66055 100644 --- a/pym/portage/sets/__init__.py +++ b/pym/portage/sets/__init__.py @@ -2,11 +2,11 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ +from __future__ import print_function + __all__ = ["SETPREFIX", "get_boolean", "SetConfigError", "SetConfig", "load_default_config"] -from __future__ import print_function - try: from configparser import SafeConfigParser, NoOptionError except ImportError: