Remove fallback imports for set(), and note minimum requirement of python-2.4

svn path=/main/trunk/; revision=7157

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 7d837e0a21ccb455f1d613f0a2ab2c0b9034ca43..030ebfd1f6cca202f372d54efc3f3787c5baf005 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -4,6 +4,8 @@ Features/major bugfixes are listed in NEWS
 portage-2.2
 ==================================
 
+* Portage now requires >=python-2.4, but doesn't need pycrypto anymore if 
+  >=python-2.5 is installed and openssl supports the rmd160 hash.
 * The python namespace for portage has been sanitized, all portage related code
   is now contained within the portage namespace. External script should be updated
   accordingly, though links exist for backward compability.

diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py
index b84edddbcfca45f5e4875b06f36ae2f0ea2ec798..00ee4c15a92858e8c1124baa44348004ffa901ff 100644 (file)
--- a/pym/emerge/__init__.py
+++ b/pym/emerge/__init__.py
@@ -51,8 +51,6 @@ from portage.data import secpass
 from portage.util import normalize_path as normpath
 from portage.util import writemsg
 
-if not hasattr(__builtins__, "set"):
-       from sets import Set as set
 from itertools import chain, izip
 from UserDict import DictMixin
 
@@ -3353,6 +3351,7 @@ class MergeTask(object):
 
        def merge(self, mylist, favorites, mtimedb):
                from portage.elog import elog_process
+               from portage.elog.filtering import filter_mergephases
                failed_fetches = []
                fetchonly = "--fetchonly" in self.myopts or \
                        "--fetch-all-uri" in self.myopts
@@ -3585,7 +3584,7 @@ class MergeTask(object):
                                                del pkgsettings["PORTAGE_BINPKG_TMPFILE"]
                                                if retval != os.EX_OK or \
                                                        "--buildpkgonly" in self.myopts:
-                                                       elog_process(pkg_key, pkgsettings)
+                                                       elog_process(pkg_key, pkgsettings, phasefilter=filter_mergephases)
                                                if retval != os.EX_OK:
                                                        return retval
                                                bintree = self.trees[myroot]["bintree"]

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 4494af05ff13069a86643d78444500d4e72d935c..4f7f89f5153fc5eebbffb2c46bead603241b569d 100644 (file)
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -28,8 +28,6 @@ try:
        from time import sleep
        from random import shuffle
        import UserDict
-       if getattr(__builtins__, "set", None) is None:
-               from sets import Set as set
        from itertools import chain, izip
 except ImportError, e:
        sys.stderr.write("\n\n")

diff --git a/pym/portage/cache/metadata_overlay.py b/pym/portage/cache/metadata_overlay.py
index 2aaa7e07cefc14a9c5de52d992ac8109425ab153..13d12787e17e27d2733ae3a0457a050fe81d5b28 100644 (file)
--- a/pym/portage/cache/metadata_overlay.py
+++ b/pym/portage/cache/metadata_overlay.py
@@ -3,8 +3,6 @@
 # $Header: $
 
 import time
-if not hasattr(__builtins__, "set"):
-       from sets import Set as set
 from portage.cache import template
 from portage.cache.cache_errors import CacheCorruption
 from portage.cache.flat_hash import database as db_rw

diff --git a/pym/portage/cache/util.py b/pym/portage/cache/util.py
index 3c6bdb70f28ed893689bf2484f4334af64622723..870e988737f73e2576c2b9d8ae63949d12909e88 100644 (file)
--- a/pym/portage/cache/util.py
+++ b/pym/portage/cache/util.py
@@ -3,8 +3,6 @@
 # License: GPL2
 # $Id$
 
-if not hasattr(__builtins__, "set"):
-       from sets import Set as set
 from itertools import chain
 from portage.cache import cache_errors
 

diff --git a/pym/portage/cache/volatile.py b/pym/portage/cache/volatile.py
index 12c23dd5639779e3f599684bfbb132642d0c4dfb..eb4f1eb9b9210bc7b0ccdb3f30c8ff0d72bd4376 100644 (file)
--- a/pym/portage/cache/volatile.py
+++ b/pym/portage/cache/volatile.py
@@ -3,8 +3,6 @@
 # $Header: $
 
 import copy
-if not hasattr(__builtins__, "set"):
-       from sets import Set as set
 from portage.cache import template
 
 class database(template.database):

diff --git a/pym/portage/data.py b/pym/portage/data.py
index d327af7267a4a536140059ca0518183b27e7f82e..958be3ca6a642a575629ea6885091afd978b9bd1 100644 (file)
--- a/pym/portage/data.py
+++ b/pym/portage/data.py
@@ -3,9 +3,6 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-if not hasattr(__builtins__, "set"):
-       from sets import Set as set
-
 import os, sys, pwd, grp
 from portage.util import writemsg
 from portage.output import green,red

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index 910f3d3c587120e967364257fc7a414377d2e935..2df2f841f3895a9bdaf2713ef75c6374cf4634bb 100644 (file)
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -9,7 +9,6 @@ from portage.data import portage_gid, portage_uid, secpass
 from portage.dbapi import dbapi
 from portage.dep import dep_getslot, use_reduce, paren_reduce, isvalidatom, \
        isjustname, dep_getkey, match_from_list
-from portage.elog import elog_process
 from portage.exception import InvalidPackageName, InvalidAtom, \
        FileNotFound, PermissionDenied, UnsupportedAPIException
 from portage.locks import lockdir, unlockdir
@@ -24,7 +23,9 @@ from portage import listdir, dep_expand, flatten, key_expand, \
        doebuild_environment, doebuild, env_update, \
        abssymlink, movefile, _movefile, bsd_chflags
 
+from portage.elog import elog_process
 from portage.elog.messages import ewarn
+from portage.elog.filtering import filter_mergephases, filter_unmergephases
 
 import os, sys, stat, errno, commands, copy, time
 from itertools import izip
@@ -1104,7 +1105,7 @@ class dblink(object):
                                try:
                                        if myebuildpath:
                                                # process logs created during pre/postrm
-                                               elog_process(self.mycpv, self.settings)
+                                               elog_process(self.mycpv, self.settings, phasefilter=filter_unmergephases)
                                                if retval == os.EX_OK:
                                                        doebuild(myebuildpath, "cleanrm", self.myroot,
                                                                self.settings, tree="vartree",
@@ -2106,7 +2107,7 @@ class dblink(object):
                        retval = self.treewalk(mergeroot, myroot, inforoot, myebuild,
                                cleanup=cleanup, mydbapi=mydbapi, prev_mtimes=prev_mtimes)
                        # Process ebuild logfiles
-                       elog_process(self.mycpv, self.settings)
+                       elog_process(self.mycpv, self.settings, phasefilter=filter_mergephases)
                        if retval == os.EX_OK and "noclean" not in self.settings.features:
                                if myebuild is None:
                                        myebuild = os.path.join(inforoot, self.pkg + ".ebuild")

diff --git a/pym/portage/getbinpkg.py b/pym/portage/getbinpkg.py
index c16570c468152ef9ec941daa38269d47949e6587..1adab1b511af73e1bd13a328975edcb30939d57f 100644 (file)
--- a/pym/portage/getbinpkg.py
+++ b/pym/portage/getbinpkg.py
@@ -3,9 +3,6 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-if not hasattr(__builtins__, "set"):
-       from sets import Set as set
-
 from portage.output import red, yellow, green
 import htmllib,HTMLParser,formatter,sys,os,portage.xpak,time,tempfile,base64,urllib2
 

diff --git a/pym/portage/manifest.py b/pym/portage/manifest.py
index 61af21d94f898b2b2bc1f21233592d9d91edece4..3116922b7ef68336fed134845a09868e205cf9fb 100644 (file)
--- a/pym/portage/manifest.py
+++ b/pym/portage/manifest.py
@@ -2,9 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-import errno, os, sets
-if not hasattr(__builtins__, "set"):
-       from sets import Set as set
+import errno, os
 
 import portage.versions, portage.const
 from portage.checksum import *
@@ -113,7 +111,7 @@ class Manifest(object):
                self.hashes.append("size")
                if manifest1_compat:
                        self.hashes.extend(portage.const.MANIFEST1_HASH_FUNCTIONS)
-               self.hashes = sets.Set(self.hashes)
+               self.hashes = set(self.hashes)
                for t in portage.const.MANIFEST2_IDENTIFIERS:
                        self.fhashdict[t] = {}
                self.compat = manifest1_compat

diff --git a/pym/portage/util.py b/pym/portage/util.py
index c2d109ae644eab2c3058b1026c7e67e1bfcd635f..de0cb80b7e28551131c55171a52fb2ea2d9e1e3d 100644 (file)
--- a/pym/portage/util.py
+++ b/pym/portage/util.py
@@ -13,9 +13,6 @@ try:
 except ImportError:
        import pickle as cPickle
 
-if not hasattr(__builtins__, "set"):
-       from sets import Set as set
-
 noiselimit = 0
 
 def writemsg(mystr,noiselevel=0,fd=None):