From 2b6ddb35bc13df23b0af198dc737909892f110bd Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 28 Apr 2010 00:04:31 -0700 Subject: [PATCH] Remove old portage module namespace compatibility that's been deprecated since portage-2.1.6. --- pym/cvstree.py | 1 - pym/dispatch_conf.py | 1 - pym/eclass_cache.py | 1 - pym/emergehelp.py | 1 - pym/getbinpkg.py | 1 - pym/output.py | 1 - pym/portage_checksum.py | 1 - pym/portage_compat_namespace.py | 45 --------------------------------- pym/portage_const.py | 1 - pym/portage_data.py | 1 - pym/portage_debug.py | 1 - pym/portage_dep.py | 1 - pym/portage_exception.py | 1 - pym/portage_exec.py | 14 ---------- pym/portage_gpg.py | 1 - pym/portage_localization.py | 1 - pym/portage_locks.py | 1 - pym/portage_mail.py | 1 - pym/portage_manifest.py | 1 - pym/portage_news.py | 1 - pym/portage_selinux.py | 1 - pym/portage_update.py | 1 - pym/portage_util.py | 1 - pym/portage_versions.py | 1 - pym/xpak.py | 1 - 25 files changed, 82 deletions(-) delete mode 120000 pym/cvstree.py delete mode 120000 pym/dispatch_conf.py delete mode 120000 pym/eclass_cache.py delete mode 120000 pym/emergehelp.py delete mode 120000 pym/getbinpkg.py delete mode 120000 pym/output.py delete mode 120000 pym/portage_checksum.py delete mode 100644 pym/portage_compat_namespace.py delete mode 120000 pym/portage_const.py delete mode 120000 pym/portage_data.py delete mode 120000 pym/portage_debug.py delete mode 120000 pym/portage_dep.py delete mode 120000 pym/portage_exception.py delete mode 100644 pym/portage_exec.py delete mode 120000 pym/portage_gpg.py delete mode 120000 pym/portage_localization.py delete mode 120000 pym/portage_locks.py delete mode 120000 pym/portage_mail.py delete mode 120000 pym/portage_manifest.py delete mode 120000 pym/portage_news.py delete mode 120000 pym/portage_selinux.py delete mode 120000 pym/portage_update.py delete mode 120000 pym/portage_util.py delete mode 120000 pym/portage_versions.py delete mode 120000 pym/xpak.py diff --git a/pym/cvstree.py b/pym/cvstree.py deleted file mode 120000 index de769f711..000000000 --- a/pym/cvstree.py +++ /dev/null @@ -1 +0,0 @@ -portage_compat_namespace.py \ No newline at end of file diff --git a/pym/dispatch_conf.py b/pym/dispatch_conf.py deleted file mode 120000 index de769f711..000000000 --- a/pym/dispatch_conf.py +++ /dev/null @@ -1 +0,0 @@ -portage_compat_namespace.py \ No newline at end of file diff --git a/pym/eclass_cache.py b/pym/eclass_cache.py deleted file mode 120000 index de769f711..000000000 --- a/pym/eclass_cache.py +++ /dev/null @@ -1 +0,0 @@ -portage_compat_namespace.py \ No newline at end of file diff --git a/pym/emergehelp.py b/pym/emergehelp.py deleted file mode 120000 index de769f711..000000000 --- a/pym/emergehelp.py +++ /dev/null @@ -1 +0,0 @@ -portage_compat_namespace.py \ No newline at end of file diff --git a/pym/getbinpkg.py b/pym/getbinpkg.py deleted file mode 120000 index de769f711..000000000 --- a/pym/getbinpkg.py +++ /dev/null @@ -1 +0,0 @@ -portage_compat_namespace.py \ No newline at end of file diff --git a/pym/output.py b/pym/output.py deleted file mode 120000 index de769f711..000000000 --- a/pym/output.py +++ /dev/null @@ -1 +0,0 @@ -portage_compat_namespace.py \ No newline at end of file diff --git a/pym/portage_checksum.py b/pym/portage_checksum.py deleted file mode 120000 index de769f711..000000000 --- a/pym/portage_checksum.py +++ /dev/null @@ -1 +0,0 @@ -portage_compat_namespace.py \ No newline at end of file diff --git a/pym/portage_compat_namespace.py b/pym/portage_compat_namespace.py deleted file mode 100644 index 2dc772838..000000000 --- a/pym/portage_compat_namespace.py +++ /dev/null @@ -1,45 +0,0 @@ -# portage_compat_namespace.py -- provide compability layer with new namespace -# Copyright 2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -""" -This module checks the name under which it is imported and attempts to load -the corresponding module of the new portage namespace, inserting it into the -loaded modules list. -It also issues a warning to the caller to migrate to the new namespace. -Note that this module should never be used with it's true name, but only by -links pointing to it. Also it is limited to portage_foo -> portage.foo -translations, however existing subpackages shouldn't use it anyway to maintain -compability with 3rd party modules (like elog or cache plugins), and they -shouldn't be directly imported by external consumers. - -This module is based on an idea by Brian Harring. -""" - -import sys, warnings - -__oldname = __name__ -if __name__.startswith("portage_"): - __newname = __name__.replace("_", ".") -else: - __newname = "portage."+__name__ - -try: - __package = __import__(__newname, globals(), locals()) - __realmodule = getattr(__package, __newname[8:]) -except (ImportError, AttributeError): - raise ImportError("No module named %s" % __oldname) - -def _showwarning(message, category, filename, lineno, file=None, line=None): - if file is None: - import sys - file = sys.stderr - try: - file.write("%s:%s: %s: %s\n" % (filename, lineno, category.__name__, message)) - except IOError: - pass - -warnings.showwarning = _showwarning - -warnings.warn("DEPRECATION NOTICE: The %s module was replaced by %s" % (__oldname, __newname), DeprecationWarning) -sys.modules[__oldname] = __realmodule diff --git a/pym/portage_const.py b/pym/portage_const.py deleted file mode 120000 index de769f711..000000000 --- a/pym/portage_const.py +++ /dev/null @@ -1 +0,0 @@ -portage_compat_namespace.py \ No newline at end of file diff --git a/pym/portage_data.py b/pym/portage_data.py deleted file mode 120000 index de769f711..000000000 --- a/pym/portage_data.py +++ /dev/null @@ -1 +0,0 @@ -portage_compat_namespace.py \ No newline at end of file diff --git a/pym/portage_debug.py b/pym/portage_debug.py deleted file mode 120000 index de769f711..000000000 --- a/pym/portage_debug.py +++ /dev/null @@ -1 +0,0 @@ -portage_compat_namespace.py \ No newline at end of file diff --git a/pym/portage_dep.py b/pym/portage_dep.py deleted file mode 120000 index de769f711..000000000 --- a/pym/portage_dep.py +++ /dev/null @@ -1 +0,0 @@ -portage_compat_namespace.py \ No newline at end of file diff --git a/pym/portage_exception.py b/pym/portage_exception.py deleted file mode 120000 index de769f711..000000000 --- a/pym/portage_exception.py +++ /dev/null @@ -1 +0,0 @@ -portage_compat_namespace.py \ No newline at end of file diff --git a/pym/portage_exec.py b/pym/portage_exec.py deleted file mode 100644 index 669a92cce..000000000 --- a/pym/portage_exec.py +++ /dev/null @@ -1,14 +0,0 @@ -# portage_compat_namespace.py -- provide compability layer with new namespace -# Copyright 2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -""" -Special edition of portage_compat_namespace.py as for this module we can't translate -name automatically as "import portage.exec" is a SyntaxError. -""" - -import sys, warnings - -import portage.process -warnings.warn("DEPRECATION NOTICE: The portage_exec module was replaced by portage.process") -sys.modules["portage_exec"] = portage.process diff --git a/pym/portage_gpg.py b/pym/portage_gpg.py deleted file mode 120000 index de769f711..000000000 --- a/pym/portage_gpg.py +++ /dev/null @@ -1 +0,0 @@ -portage_compat_namespace.py \ No newline at end of file diff --git a/pym/portage_localization.py b/pym/portage_localization.py deleted file mode 120000 index de769f711..000000000 --- a/pym/portage_localization.py +++ /dev/null @@ -1 +0,0 @@ -portage_compat_namespace.py \ No newline at end of file diff --git a/pym/portage_locks.py b/pym/portage_locks.py deleted file mode 120000 index de769f711..000000000 --- a/pym/portage_locks.py +++ /dev/null @@ -1 +0,0 @@ -portage_compat_namespace.py \ No newline at end of file diff --git a/pym/portage_mail.py b/pym/portage_mail.py deleted file mode 120000 index de769f711..000000000 --- a/pym/portage_mail.py +++ /dev/null @@ -1 +0,0 @@ -portage_compat_namespace.py \ No newline at end of file diff --git a/pym/portage_manifest.py b/pym/portage_manifest.py deleted file mode 120000 index de769f711..000000000 --- a/pym/portage_manifest.py +++ /dev/null @@ -1 +0,0 @@ -portage_compat_namespace.py \ No newline at end of file diff --git a/pym/portage_news.py b/pym/portage_news.py deleted file mode 120000 index de769f711..000000000 --- a/pym/portage_news.py +++ /dev/null @@ -1 +0,0 @@ -portage_compat_namespace.py \ No newline at end of file diff --git a/pym/portage_selinux.py b/pym/portage_selinux.py deleted file mode 120000 index de769f711..000000000 --- a/pym/portage_selinux.py +++ /dev/null @@ -1 +0,0 @@ -portage_compat_namespace.py \ No newline at end of file diff --git a/pym/portage_update.py b/pym/portage_update.py deleted file mode 120000 index de769f711..000000000 --- a/pym/portage_update.py +++ /dev/null @@ -1 +0,0 @@ -portage_compat_namespace.py \ No newline at end of file diff --git a/pym/portage_util.py b/pym/portage_util.py deleted file mode 120000 index de769f711..000000000 --- a/pym/portage_util.py +++ /dev/null @@ -1 +0,0 @@ -portage_compat_namespace.py \ No newline at end of file diff --git a/pym/portage_versions.py b/pym/portage_versions.py deleted file mode 120000 index de769f711..000000000 --- a/pym/portage_versions.py +++ /dev/null @@ -1 +0,0 @@ -portage_compat_namespace.py \ No newline at end of file diff --git a/pym/xpak.py b/pym/xpak.py deleted file mode 120000 index de769f711..000000000 --- a/pym/xpak.py +++ /dev/null @@ -1 +0,0 @@ -portage_compat_namespace.py \ No newline at end of file -- 2.26.2