Rename the portage.sets module to portage._sets since it will be useful

in the upcoming 2.1.9 branch which will not have sets support but will
still have the code in private and disabled form.

diff --git a/bin/emaint b/bin/emaint
index 6a73c6fe20372ba2244e53b9408d51501a1089c6..5ff60422c7e5ad188237dd70383cce26f90792f7 100755 (executable)
--- a/bin/emaint
+++ b/bin/emaint
@@ -32,7 +32,7 @@ class WorldHandler(object):
                self.not_installed = []
                self.invalid_category = []
                self.okay = []
-               from portage.sets import load_default_config
+               from portage._sets import load_default_config
                setconfig = load_default_config(portage.settings,
                        portage.db[portage.settings["ROOT"]])
                self._sets = setconfig.getSets()
@@ -44,7 +44,7 @@ class WorldHandler(object):
                self.found = os.access(self.world_file, os.R_OK)
                vardb = portage.db[myroot]["vartree"].dbapi
 
-               from portage.sets import SETPREFIX
+               from portage._sets import SETPREFIX
                sets = self._sets
                world_atoms = list(sets["selected"])
                maxval = len(world_atoms)

diff --git a/bin/quickpkg b/bin/quickpkg
index 042e98cc25e853de1ba0a84ca4653265e3e4780f..3e971f5d75ea609fe17849286ddd44cfdc6c958c 100755 (executable)
--- a/bin/quickpkg
+++ b/bin/quickpkg
@@ -26,7 +26,7 @@ from portage.exception import InvalidAtom, InvalidData, InvalidDependString, Pac
 from portage.util import ConfigProtect, ensure_dirs, shlex_split
 from portage.dbapi.vartree import dblink, tar_contents
 from portage.checksum import perform_md5
-from portage.sets import load_default_config, SETPREFIX
+from portage._sets import load_default_config, SETPREFIX
 
 def quickpkg_atom(options, infos, arg, eout):
        settings = portage.settings

diff --git a/bin/regenworld b/bin/regenworld
index c3e7f4470ee451ae90de416f3bc5ab86ef61c68c..292eac1ac73f08f26422c686d0d8a3fa2da5ccb1 100755 (executable)
--- a/bin/regenworld
+++ b/bin/regenworld
@@ -13,7 +13,7 @@ except ImportError:
        import portage
 
 from portage import os
-from portage.sets.files import StaticFileSet, WorldSelectedSet
+from portage._sets.files import StaticFileSet, WorldSelectedSet
 
 import re
 import tempfile

diff --git a/pym/_emerge/BlockerDB.py b/pym/_emerge/BlockerDB.py
index 8b2a22d8e8b11edb0cf51820a775064bca94f8d7..f671a58a796a0c0b5d9f8a73258b23745ce24dd8 100644 (file)
--- a/pym/_emerge/BlockerDB.py
+++ b/pym/_emerge/BlockerDB.py
@@ -6,7 +6,7 @@ import sys
 import portage
 from portage import os
 from portage import digraph
-from portage.sets.base import InternalPackageSet
+from portage._sets.base import InternalPackageSet
 
 from _emerge.BlockerCache import BlockerCache
 from _emerge.FakeVartree import FakeVartree

diff --git a/pym/_emerge/Scheduler.py b/pym/_emerge/Scheduler.py
index 7db16088d5f408c4d6916f975cda534638d647d5..ee5b8a3d5c466bf707e3c0b6e6ee6b22b137960c 100644 (file)
--- a/pym/_emerge/Scheduler.py
+++ b/pym/_emerge/Scheduler.py
@@ -24,8 +24,8 @@ from portage.elog.messages import eerror
 from portage.localization import _
 from portage.output import colorize, create_color_func, red
 bad = create_color_func("BAD")
-from portage.sets import SETPREFIX
-from portage.sets.base import InternalPackageSet
+from portage._sets import SETPREFIX
+from portage._sets.base import InternalPackageSet
 from portage.util import writemsg, writemsg_level
 from portage.package.ebuild.digestcheck import digestcheck
 from portage.package.ebuild.digestgen import digestgen

diff --git a/pym/_emerge/SetArg.py b/pym/_emerge/SetArg.py
index e43ad5812d361ba1430dfedef97cf3c20b08ac64..2941695a85f58c8be66bdae5cf87374f173a988b 100644 (file)
--- a/pym/_emerge/SetArg.py
+++ b/pym/_emerge/SetArg.py
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 from _emerge.DependencyArg import DependencyArg
-from portage.sets import SETPREFIX
+from portage._sets import SETPREFIX
 class SetArg(DependencyArg):
        def __init__(self, set=None, **kwargs):
                DependencyArg.__init__(self, **kwargs)

diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py
index 99b2a469ea1b5e90d8364cbbb3c0c664450884d8..3c735aa2cff92359ae167786a0304e51b7b9b50f 100644 (file)
--- a/pym/_emerge/actions.py
+++ b/pym/_emerge/actions.py
@@ -34,8 +34,8 @@ from portage.output import blue, bold, colorize, create_color_func, darkgreen, \
 good = create_color_func("GOOD")
 bad = create_color_func("BAD")
 from portage.package.ebuild._ipc.QueryCommand import QueryCommand
-from portage.sets import load_default_config, SETPREFIX
-from portage.sets.base import InternalPackageSet
+from portage._sets import load_default_config, SETPREFIX
+from portage._sets.base import InternalPackageSet
 from portage.util import cmp_sort_key, writemsg, \
        writemsg_level, writemsg_stdout
 from portage._global_updates import _global_updates

diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index cb9c5d4c095e332d9047725257ff2b10ca586ffd..25429601eea6227465f03e54f464124f44c71eea 100644 (file)
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -24,8 +24,8 @@ from portage.output import bold, blue, colorize, create_color_func, darkblue, \
 bad = create_color_func("BAD")
 from portage.package.ebuild.getmaskingstatus import \
        _getmaskingstatus, _MaskReason
-from portage.sets import SETPREFIX
-from portage.sets.base import InternalPackageSet
+from portage._sets import SETPREFIX
+from portage._sets.base import InternalPackageSet
 from portage.util import cmp_sort_key, writemsg, writemsg_stdout
 from portage.util import writemsg_level
 

diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py
index 3bd72226fe30bda8f64d3ae5e8038c5d4bb45319..19027ea477776c38c78f9a5c37a265c828ebefe1 100644 (file)
--- a/pym/_emerge/main.py
+++ b/pym/_emerge/main.py
@@ -32,7 +32,7 @@ from portage.data import secpass
 from portage.dbapi.dep_expand import dep_expand
 from portage.util import normalize_path as normpath
 from portage.util import shlex_split, writemsg_level, writemsg_stdout
-from portage.sets import SETPREFIX
+from portage._sets import SETPREFIX
 from portage._global_updates import _global_updates
 
 from _emerge.actions import action_config, action_sync, action_metadata, \
@@ -1001,9 +1001,9 @@ def ionice(settings):
                out.eerror("See the make.conf(5) man page for PORTAGE_IONICE_COMMAND usage instructions.")
 
 def setconfig_fallback(root_config):
-       from portage.sets.base import DummyPackageSet
-       from portage.sets.files import WorldSelectedSet
-       from portage.sets.profiles import PackagesSystemSet
+       from portage._sets.base import DummyPackageSet
+       from portage._sets.files import WorldSelectedSet
+       from portage._sets.profiles import PackagesSystemSet
        setconfig = root_config.setconfig
        setconfig.psets['world'] = DummyPackageSet(atoms=['@selected', '@system'])
        setconfig.psets['selected'] = WorldSelectedSet(root_config.settings['EROOT'])

diff --git a/pym/_emerge/resolver/slot_collision.py b/pym/_emerge/resolver/slot_collision.py
index c2156850e39cd48dec872e3271813f97f6218aa2..1bde0bea46b8144a50ea81c7170ca14bcfe698b0 100644 (file)
--- a/pym/_emerge/resolver/slot_collision.py
+++ b/pym/_emerge/resolver/slot_collision.py
@@ -5,7 +5,7 @@ from _emerge.Package import Package
 from _emerge.PackageArg import PackageArg
 from portage.dep import check_required_use
 from portage.output import colorize
-from portage.sets.base import InternalPackageSet
+from portage._sets.base import InternalPackageSet
 from portage.util import writemsg
 from portage.versions import cpv_getversion, vercmp
 

diff --git a/pym/_emerge/unmerge.py b/pym/_emerge/unmerge.py
index 5b466e2d612c275d2a1261565f232e4824853655..dc9030ea2cd77c27a302089daf2da4b0cf5a9354 100644 (file)
--- a/pym/_emerge/unmerge.py
+++ b/pym/_emerge/unmerge.py
@@ -9,7 +9,7 @@ import textwrap
 import portage
 from portage import os
 from portage.output import bold, colorize, darkgreen, green
-from portage.sets import SETPREFIX
+from portage._sets import SETPREFIX
 from portage.util import cmp_sort_key
 
 from _emerge.emergelog import emergelog
@@ -281,7 +281,7 @@ def unmerge(root_config, myopts, unmerge_action,
                        vartree.dbapi.flush_cache()
                        portage.locks.unlockdir(vdb_lock)
        
-       from portage.sets.base import EditablePackageSet
+       from portage._sets.base import EditablePackageSet
        
        # generate a list of package sets that are directly or indirectly listed in "selected",
        # as there is no persistent list of "installed" sets

diff --git a/pym/portage/sets/__init__.py b/pym/portage/_sets/__init__.py
similarity index 95%
rename from pym/portage/sets/__init__.py
rename to pym/portage/_sets/__init__.py
index a942ac94aaea8b76798040a17f0051f1fc3fbd05..66d558f6c929624b082c8bb82a52c575531319cb 100644 (file)
--- a/pym/portage/sets/__init__.py
+++ b/pym/portage/_sets/__init__.py
@@ -81,16 +81,21 @@ class SetConfig(object):
                for sname in parser.sections():
                        # find classname for current section, default to file based sets
                        if not parser.has_option(sname, "class"):
-                               classname = "portage.sets.files.StaticFileSet"
+                               classname = "portage._sets.files.StaticFileSet"
                        else:
                                classname = parser.get(sname, "class")
-                       
+
+                       if classname.startswith('portage.sets.'):
+                               # The module has been made private, but we still support
+                               # the previous namespace for sets.conf entries.
+                               classname = classname.replace('sets', '_sets', 1)
+
                        # try to import the specified class
                        try:
                                setclass = load_mod(classname)
                        except (ImportError, AttributeError):
                                try:
-                                       setclass = load_mod("portage.sets."+classname)
+                                       setclass = load_mod("portage._sets." + classname)
                                except (ImportError, AttributeError):
                                        self.errors.append(_("Could not import '%(class)s' for section "
                                                "'%(section)s'") % {"class": classname, "section": sname})

diff --git a/pym/portage/sets/base.py b/pym/portage/_sets/base.py
similarity index 100%
rename from pym/portage/sets/base.py
rename to pym/portage/_sets/base.py

diff --git a/pym/portage/sets/dbapi.py b/pym/portage/_sets/dbapi.py
similarity index 99%
rename from pym/portage/sets/dbapi.py
rename to pym/portage/_sets/dbapi.py
index 8bacb72fc3d82aa7ba22b706db8702beff7cad93..362cc91c6cb9b839a6073b2c1154b958b97711e7 100644 (file)
--- a/pym/portage/sets/dbapi.py
+++ b/pym/portage/_sets/dbapi.py
@@ -7,8 +7,8 @@ from portage import os
 from portage.versions import catpkgsplit, catsplit, pkgcmp, best
 from portage.dep import Atom
 from portage.localization import _
-from portage.sets.base import PackageSet
-from portage.sets import SetConfigError, get_boolean
+from portage._sets.base import PackageSet
+from portage._sets import SetConfigError, get_boolean
 import portage
 
 __all__ = ["CategorySet", "DowngradeSet",

diff --git a/pym/portage/sets/files.py b/pym/portage/_sets/files.py
similarity index 98%
rename from pym/portage/sets/files.py
rename to pym/portage/_sets/files.py
index 4565c7257a01ef47b4c72a2af8a9bd7e48c6dd18..8116d07cdd98ef517d071350f16d4e62404bbca2 100644 (file)
--- a/pym/portage/sets/files.py
+++ b/pym/portage/_sets/files.py
@@ -14,8 +14,8 @@ from portage.const import USER_CONFIG_PATH, WORLD_FILE, WORLD_SETS_FILE
 from portage.localization import _
 from portage.locks import lockfile, unlockfile
 from portage import portage_gid
-from portage.sets.base import PackageSet, EditablePackageSet
-from portage.sets import SetConfigError, SETPREFIX, get_boolean
+from portage._sets.base import PackageSet, EditablePackageSet
+from portage._sets import SetConfigError, SETPREFIX, get_boolean
 from portage.env.loaders import ItemFileLoader, KeyListFileLoader
 from portage.env.validators import ValidAtomValidator
 from portage import cpv_getkey

diff --git a/pym/portage/sets/libs.py b/pym/portage/_sets/libs.py
similarity index 97%
rename from pym/portage/sets/libs.py
rename to pym/portage/_sets/libs.py
index 74c16a12974f2a287d7ab0b1fa1fc05e3f57a585..20347e4520aceb7a30f1880df1bbf10415a02a64 100644 (file)
--- a/pym/portage/sets/libs.py
+++ b/pym/portage/_sets/libs.py
@@ -4,8 +4,8 @@
 from __future__ import print_function
 
 from portage.localization import _
-from portage.sets.base import PackageSet
-from portage.sets import get_boolean
+from portage._sets.base import PackageSet
+from portage._sets import get_boolean
 from portage.versions import catpkgsplit
 import portage
 

diff --git a/pym/portage/sets/profiles.py b/pym/portage/_sets/profiles.py
similarity index 95%
rename from pym/portage/sets/profiles.py
rename to pym/portage/_sets/profiles.py
index 3e2ab905594ded894126eb4d6753817963f128c5..e47f08db3c4f0d67996b69bde60cfc2f9751bb5c 100644 (file)
--- a/pym/portage/sets/profiles.py
+++ b/pym/portage/_sets/profiles.py
@@ -5,8 +5,8 @@ import logging
 
 from portage import os
 from portage.util import grabfile_package, stack_lists
-from portage.sets.base import PackageSet
-from portage.sets import get_boolean
+from portage._sets.base import PackageSet
+from portage._sets import get_boolean
 from portage.util import writemsg_level
 
 __all__ = ["PackagesSystemSet"]

diff --git a/pym/portage/sets/security.py b/pym/portage/_sets/security.py
similarity index 97%
rename from pym/portage/sets/security.py
rename to pym/portage/_sets/security.py
index 61dfed819731c703669d46d9a553aac3a04f31c5..2d8fcf667ccf1db4e7d4c01b8259006655348abe 100644 (file)
--- a/pym/portage/sets/security.py
+++ b/pym/portage/_sets/security.py
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 import portage.glsa as glsa
-from portage.sets.base import PackageSet
+from portage._sets.base import PackageSet
 from portage.versions import catpkgsplit, pkgcmp
-from portage.sets import get_boolean
+from portage._sets import get_boolean
 
 __all__ = ["SecuritySet", "NewGlsaSet", "NewAffectedSet", "AffectedSet"]
 

diff --git a/pym/portage/sets/shell.py b/pym/portage/_sets/shell.py
similarity index 93%
rename from pym/portage/sets/shell.py
rename to pym/portage/_sets/shell.py
index 2edd82d7e859702f45ab517d4a34d8b11894928b..2c95845c839d2fb34e97188da7f7e88856b66d85 100644 (file)
--- a/pym/portage/sets/shell.py
+++ b/pym/portage/_sets/shell.py
@@ -5,8 +5,8 @@ import subprocess
 
 from portage import os
 from portage import _unicode_decode
-from portage.sets.base import PackageSet
-from portage.sets import SetConfigError
+from portage._sets.base import PackageSet
+from portage._sets import SetConfigError
 
 __all__ = ["CommandOutputSet"]
 

diff --git a/pym/portage/tests/resolver/ResolverPlayground.py b/pym/portage/tests/resolver/ResolverPlayground.py
index f7707b5eaf387bde7da958d902f2659bdb2099c0..854ac43eb7f5c57bfab99153697683f33e1125d7 100644 (file)
--- a/pym/portage/tests/resolver/ResolverPlayground.py
+++ b/pym/portage/tests/resolver/ResolverPlayground.py
@@ -12,7 +12,7 @@ from portage.dbapi.porttree import portagetree
 from portage.dbapi.bintree import binarytree
 from portage.dep import Atom
 from portage.package.ebuild.config import config
-from portage.sets import load_default_config
+from portage._sets import load_default_config
 from portage.versions import catsplit
 
 from _emerge.Blocker import Blocker

diff --git a/pym/portage/tests/sets/base/testInternalPackageSet.py b/pym/portage/tests/sets/base/testInternalPackageSet.py
index 70b3a1401587fbd4f959ad3165a0cbc695c7b536..e0a347876932f7da0619092e536d41341dbed8df 100644 (file)
--- a/pym/portage/tests/sets/base/testInternalPackageSet.py
+++ b/pym/portage/tests/sets/base/testInternalPackageSet.py
@@ -5,7 +5,7 @@
 from portage.dep import Atom
 from portage.exception import InvalidAtom
 from portage.tests import TestCase
-from portage.sets.base import InternalPackageSet
+from portage._sets.base import InternalPackageSet
 
 class InternalPackageSetTestCase(TestCase):
        """Simple Test Case for InternalPackageSet"""

diff --git a/pym/portage/tests/sets/files/testConfigFileSet.py b/pym/portage/tests/sets/files/testConfigFileSet.py
index c11228e9c0622eb492548eb2cb8ffc569d6e0edb..3ec26a07702972e76168ecd2a13338720e2216fd 100644 (file)
--- a/pym/portage/tests/sets/files/testConfigFileSet.py
+++ b/pym/portage/tests/sets/files/testConfigFileSet.py
@@ -6,7 +6,7 @@ import tempfile
 
 from portage import os
 from portage.tests import TestCase, test_cps
-from portage.sets.files import ConfigFileSet
+from portage._sets.files import ConfigFileSet
 
 class ConfigFileSetTestCase(TestCase):
        """Simple Test Case for ConfigFileSet"""

diff --git a/pym/portage/tests/sets/files/testStaticFileSet.py b/pym/portage/tests/sets/files/testStaticFileSet.py
index 174190dbb6a333f8fcacaad644a745baf2f943dc..d515a6728b464992fee07880dc9cdfa89e2c33c6 100644 (file)
--- a/pym/portage/tests/sets/files/testStaticFileSet.py
+++ b/pym/portage/tests/sets/files/testStaticFileSet.py
@@ -6,7 +6,7 @@ import tempfile
 
 from portage import os
 from portage.tests import TestCase, test_cps
-from portage.sets.files import StaticFileSet
+from portage._sets.files import StaticFileSet
 
 class StaticFileSetTestCase(TestCase):
        """Simple Test Case for StaticFileSet"""

diff --git a/pym/portage/tests/sets/shell/testShell.py b/pym/portage/tests/sets/shell/testShell.py
index dd8825412b3052dd9cc96a92bf5b5dc419d310bc..2cdd833c32fe76fce104f51971d3bfd4ec8a1e55 100644 (file)
--- a/pym/portage/tests/sets/shell/testShell.py
+++ b/pym/portage/tests/sets/shell/testShell.py
@@ -4,7 +4,7 @@
 
 from portage.process import find_binary
 from portage.tests import TestCase, test_cps
-from portage.sets.shell import CommandOutputSet
+from portage._sets.shell import CommandOutputSet
 
 class CommandOutputSetTestCase(TestCase):
        """Simple Test Case for CommandOutputSet"""