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 df4ab5c273a8e7e5460416156abdc3411607cbb5..b95205945152df00685c4213e453198cf0d976a8 100644 (file)
--- 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 c617efc3a5a2fe43b9db4ad7d5afb0ba902e74b2..01ce6605592151e1329ed11c02b20d061270e839 100644 (file)
--- 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: