From: Marius Mauch Date: Sat, 6 Oct 2007 14:27:58 +0000 (-0000) Subject: clean up module namespace X-Git-Tag: v2.2_pre1~702 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f7c010f2bc27bef3c1f088d66b7844cb0959b724;p=portage.git clean up module namespace svn path=/main/trunk/; revision=7981 --- diff --git a/pym/portage/sets/__init__.py b/pym/portage/sets/__init__.py index de588fb4f..9cf90600a 100644 --- a/pym/portage/sets/__init__.py +++ b/pym/portage/sets/__init__.py @@ -14,6 +14,9 @@ DEFAULT_SETS = ["world", "system", "everything", "security"] \ +["package_"+x for x in ["mask", "unmask", "use", "keywords"]] del x +__all__ = ["PackageSet", "EditablePackageSet", "InternalPackageSet", \ + "SetConfigError", "SetConfig", "make_default_config"] + class PackageSet(object): # Set this to operations that are supported by your subclass. While # technically there is no difference between "merge" and "unmerge" regarding @@ -270,7 +273,6 @@ if __name__ == "__main__": import portage sc = make_default_config(portage.settings, portage.db["/"]) l, e = sc.getSets() - print l, e for x in l: print x+":" print "DESCRIPTION = %s" % l[x].getMetadata("Description") diff --git a/pym/portage/sets/dbapi.py b/pym/portage/sets/dbapi.py index 1a7a66907..164027943 100644 --- a/pym/portage/sets/dbapi.py +++ b/pym/portage/sets/dbapi.py @@ -5,6 +5,8 @@ from portage.versions import catsplit from portage.sets import PackageSet, SetConfigError +__all__ = ["CategorySet", "EverythingSet"] + class EverythingSet(PackageSet): _operations = ["merge", "unmerge"] description = "Package set containing all installed packages" diff --git a/pym/portage/sets/files.py b/pym/portage/sets/files.py index b2b4191bf..c6656397e 100644 --- a/pym/portage/sets/files.py +++ b/pym/portage/sets/files.py @@ -13,6 +13,8 @@ from portage.sets import PackageSet, EditablePackageSet, SetConfigError from portage.env.loaders import ItemFileLoader, KeyListFileLoader from portage.env.validators import ValidAtomValidator +__all__ = ["StaticFileSet", "ConfigFileSet", "WorldSet"] + class StaticFileSet(EditablePackageSet): _operations = ["merge", "unmerge"] diff --git a/pym/portage/sets/profiles.py b/pym/portage/sets/profiles.py index 6d629fc67..fcefaff88 100644 --- a/pym/portage/sets/profiles.py +++ b/pym/portage/sets/profiles.py @@ -6,6 +6,8 @@ import os from portage.util import grabfile_package, stack_lists from portage.sets import PackageSet +__all__ = ["PackagesSystemSet"] + class PackagesSystemSet(PackageSet): _operations = ["merge"] diff --git a/pym/portage/sets/security.py b/pym/portage/sets/security.py index 576009364..f58e725f9 100644 --- a/pym/portage/sets/security.py +++ b/pym/portage/sets/security.py @@ -8,6 +8,8 @@ from portage.util import grabfile, write_atomic from portage.const import CACHE_PATH from portage.sets import PackageSet +__all__ = ["SecuritySet", "NewGlsaSet", "NewAffectedSet", "AffectedSet"] + class SecuritySet(PackageSet): _operations = ["merge"] _skip_applied = False diff --git a/pym/portage/sets/shell.py b/pym/portage/sets/shell.py index d61c116ce..56b8ef5ef 100644 --- a/pym/portage/sets/shell.py +++ b/pym/portage/sets/shell.py @@ -7,6 +7,8 @@ import os from portage.sets import PackageSet, SetConfigError +__all__ = ["CommandOutputSet"] + class CommandOutputSet(PackageSet): """This class creates a PackageSet from the output of a shell command. The shell command should produce one atom per line, that is: