Merged from trunk -r15517:15717

   | 15633   | Add section for portage-2.1.8.                               |
   | zmedico |                                                              |

   | 15714   | Clean up imports.                                            |
   | zmedico |                                                              |

   | 15715   | Move imports to top.                                         |
   | zmedico |                                                              |

   | 15716   | Clean up imports and unused variables.                       |
   | zmedico |                                                              |

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

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 4d59d4e72c435d40d808ecdc885e6c0618fed71c..a19d31f60cfe231b7c11de32e10156a4d0d8027a 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -21,6 +21,9 @@ portage-2.2
 * "world" now includes separate "selected" and "system" sets, where the
   "selected" set includes packages listed in /var/lib/portage/world and nested
   sets that may be listed /var/lib/portage/world_sets.
+
+portage-2.1.8
+==================================
 * The new --rebuilt-binaries option will replace installed packages with binary
   packages that have been rebuilt. Rebuilds are detected by comparison of
   BUILD_TIME package metadata. This option is enabled automatically when using

diff --git a/pym/portage/package/ebuild/fetch.py b/pym/portage/package/ebuild/fetch.py
index ccacf40224cb40319c7b3138f68f7e2e02561ff2..f6e03d5e652d64b19f4fa86fb3d7a47833b1171c 100644 (file)
--- a/pym/portage/package/ebuild/fetch.py
+++ b/pym/portage/package/ebuild/fetch.py
@@ -14,6 +14,7 @@ import re
 import shutil
 import stat
 import sys
+import tempfile
 
 
 import portage
@@ -140,8 +141,8 @@ def _checksum_failure_temp_file(distdir, basename):
                        os.unlink(filename)
                        return temp_filename
 
-       from tempfile import mkstemp
-       fd, temp_filename = mkstemp("", basename + "._checksum_failure_.", distdir)
+       fd, temp_filename = \
+               tempfile.mkstemp("", basename + "._checksum_failure_.", distdir)
        os.close(fd)
        os.rename(filename, temp_filename)
        return temp_filename
@@ -1064,9 +1065,8 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0, locks_in_subdir=".locks",
                                        # Use a temporary config instance to avoid altering
                                        # the state of the one that's been passed in.
                                        mysettings = config(clone=mysettings)
-                                       from tempfile import mkdtemp
                                        try:
-                                               private_tmpdir = mkdtemp("", "._portage_fetch_.",
+                                               private_tmpdir = tempfile.mkdtemp("", "._portage_fetch_.",
                                                        global_tmpdir)
                                        except OSError as e:
                                                if e.errno != PermissionDenied.errno:

diff --git a/pym/portage/sets/base.py b/pym/portage/sets/base.py
index 0d88d0efb829b891d590a3dde7a72274fca2348b..8b791c5e174bb74a3740d1be0e1d67d4b3a9c8b0 100644 (file)
--- a/pym/portage/sets/base.py
+++ b/pym/portage/sets/base.py
@@ -3,10 +3,9 @@
 # $Id$
 
 import sys
-from portage import cpv_getkey, flatten
-from portage.dep import Atom, isvalidatom, match_from_list, \
-     best_match_to_list, use_reduce, paren_reduce
+from portage.dep import Atom, best_match_to_list, match_from_list
 from portage.exception import InvalidAtom
+from portage.versions import cpv_getkey
 
 if sys.hexversion >= 0x3000000:
        basestring = str

diff --git a/pym/portage/util/__init__.py b/pym/portage/util/__init__.py
index e8a33f3ca53b7cf8ca80501bd9e50dc26a39b4bb..272d381e2124882274ddeedc88ddcc09b3ba1b3d 100644 (file)
--- a/pym/portage/util/__init__.py
+++ b/pym/portage/util/__init__.py
@@ -12,11 +12,8 @@ __all__ = ['apply_permissions', 'apply_recursive_permissions',
        'stack_dicts', 'stack_lists', 'unique_array', 'varexpand', 'write_atomic',
        'writedict', 'writemsg', 'writemsg_level', 'writemsg_stdout']
 
-try:
-       from subprocess import getstatusoutput as subprocess_getstatusoutput
-except ImportError:
-       from commands import getstatusoutput as subprocess_getstatusoutput
 import codecs
+from copy import deepcopy
 import errno
 import logging
 import re
@@ -24,27 +21,25 @@ import shlex
 import stat
 import string
 import sys
+import traceback
 
 import portage
 from portage import StringIO
 from portage import os
+from portage import pickle
+from portage import subprocess_getstatusoutput
 from portage import _encodings
 from portage import _os_merge
 from portage import _unicode_encode
 from portage import _unicode_decode
 from portage.exception import InvalidAtom, PortageException, FileNotFound, \
        OperationNotPermitted, PermissionDenied, ReadOnlyFileSystem
-from portage.dep import Atom, isvalidatom
+from portage.dep import Atom
 from portage.localization import _
 from portage.proxy.objectproxy import ObjectProxy
 from portage.cache.mappings import UserDict
 from portage.const import EPREFIX, EPREFIX_LSTRIP
 
-try:
-       import cPickle as pickle
-except ImportError:
-       import pickle
-
 noiselimit = 0
 
 def initialize_logger(level=logging.WARN):
@@ -612,7 +607,6 @@ def varexpand(mystring, mydict={}):
 pickle_write = None
 
 def pickle_read(filename,default=None,debug=0):
-       import os
        if not os.access(filename, os.R_OK):
                writemsg(_("pickle_read(): File not readable. '")+filename+"'\n",1)
                return default
@@ -633,7 +627,6 @@ def pickle_read(filename,default=None,debug=0):
        return data
 
 def dump_traceback(msg, noiselevel=1):
-       import sys, traceback
        info = sys.exc_info()
        if not info[2]:
                stack = traceback.extract_stack()[:-1]
@@ -752,7 +745,6 @@ def apply_permissions(filename, uid=-1, gid=-1, mode=-1, mask=-1,
                        if follow_links:
                                os.chown(filename, uid, gid)
                        else:
-                               import portage.data
                                portage.data.lchown(filename, uid, gid)
                        modified = True
                except OSError as oe:
@@ -902,7 +894,6 @@ def apply_secpass_permissions(filename, uid=-1, gid=-1, mode=-1, mask=-1,
 
        all_applied = True
 
-       import portage.data # not imported globally because of circular dep
        if portage.data.secpass < 2:
 
                if uid != -1 and \
@@ -1178,7 +1169,6 @@ class LazyItemsDict(UserDict):
                """
                if memo is None:
                        memo = {}
-               from copy import deepcopy
                result = self.__class__()
                memo[id(self)] = result
                for k in self:
@@ -1225,7 +1215,6 @@ class LazyItemsDict(UserDict):
                        """
                        if memo is None:
                                memo = {}
-                       from copy import deepcopy
                        result = self.__copy__()
                        memo[id(self)] = result
                        result.func = deepcopy(self.func, memo)
@@ -1252,7 +1241,6 @@ class ConfigProtect(object):
                for x in self.protect_list:
                        ppath = normalize_path(
                                os.path.join(self.myroot + EPREFIX_LSTRIP, x.lstrip(os.path.sep)))
-                       mystat = None
                        try:
                                if stat.S_ISDIR(os.stat(ppath).st_mode):
                                        self._dirs.add(ppath)
@@ -1265,7 +1253,6 @@ class ConfigProtect(object):
                for x in self.mask_list:
                        ppath = normalize_path(
                                os.path.join(self.myroot + EPREFIX_LSTRIP, x.lstrip(os.path.sep)))
-                       mystat = None
                        try:
                                """Use lstat so that anything, even a broken symlink can be
                                protected."""
@@ -1352,7 +1339,6 @@ def new_protect_filename(mydest, newmd5=None):
                "._cfg" + str(prot_num).zfill(4) + "_" + real_filename))
        old_pfile = normalize_path(os.path.join(real_dirname, last_pfile))
        if last_pfile and newmd5:
-               import portage.checksum
                try:
                        last_pfile_md5 = portage.checksum._perform_md5_merge(old_pfile)
                except FileNotFound: