From 90232b851e5666f28a17a5d66024e9de10fef4a6 Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Mon, 12 May 2008 19:35:30 +0000 Subject: [PATCH] manually merge differences with the trunk svn path=/main/branches/prefix/; revision=10309 --- pym/portage_checksum.py | 7 ++++++- pym/portage_const.py | 7 ++++++- pym/portage_data.py | 7 ++++++- pym/portage_debug.py | 7 ++++++- pym/portage_dep.py | 7 ++++++- pym/portage_exception.py | 7 ++++++- pym/portage_gpg.py | 7 ++++++- pym/portage_localization.py | 7 ++++++- pym/portage_locks.py | 7 ++++++- pym/portage_mail.py | 7 ++++++- pym/portage_manifest.py | 7 ++++++- pym/portage_news.py | 7 ++++++- pym/portage_selinux.py | 7 ++++++- pym/portage_update.py | 7 ++++++- pym/portage_util.py | 7 ++++++- pym/portage_versions.py | 7 ++++++- 16 files changed, 96 insertions(+), 16 deletions(-) diff --git a/pym/portage_checksum.py b/pym/portage_checksum.py index 9e5e691a9..b6c3da569 100644 --- a/pym/portage_checksum.py +++ b/pym/portage_checksum.py @@ -31,5 +31,10 @@ try: except ImportError, AttributeError: raise ImportError("No module named %s" % __oldname) -warnings.warn("DEPRECATION NOTICE: The %s module was replaced by %s" % (__oldname, __newname)) +def _formatwarning(message, category, filename, lineno): + return "%s:%s: %s: %s\n" % (filename, lineno, category.__name__, message) + +warnings.formatwarning = _formatwarning + +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 index 9e5e691a9..b6c3da569 100644 --- a/pym/portage_const.py +++ b/pym/portage_const.py @@ -31,5 +31,10 @@ try: except ImportError, AttributeError: raise ImportError("No module named %s" % __oldname) -warnings.warn("DEPRECATION NOTICE: The %s module was replaced by %s" % (__oldname, __newname)) +def _formatwarning(message, category, filename, lineno): + return "%s:%s: %s: %s\n" % (filename, lineno, category.__name__, message) + +warnings.formatwarning = _formatwarning + +warnings.warn("DEPRECATION NOTICE: The %s module was replaced by %s" % (__oldname, __newname), DeprecationWarning) sys.modules[__oldname] = __realmodule diff --git a/pym/portage_data.py b/pym/portage_data.py index 9e5e691a9..b6c3da569 100644 --- a/pym/portage_data.py +++ b/pym/portage_data.py @@ -31,5 +31,10 @@ try: except ImportError, AttributeError: raise ImportError("No module named %s" % __oldname) -warnings.warn("DEPRECATION NOTICE: The %s module was replaced by %s" % (__oldname, __newname)) +def _formatwarning(message, category, filename, lineno): + return "%s:%s: %s: %s\n" % (filename, lineno, category.__name__, message) + +warnings.formatwarning = _formatwarning + +warnings.warn("DEPRECATION NOTICE: The %s module was replaced by %s" % (__oldname, __newname), DeprecationWarning) sys.modules[__oldname] = __realmodule diff --git a/pym/portage_debug.py b/pym/portage_debug.py index 9e5e691a9..b6c3da569 100644 --- a/pym/portage_debug.py +++ b/pym/portage_debug.py @@ -31,5 +31,10 @@ try: except ImportError, AttributeError: raise ImportError("No module named %s" % __oldname) -warnings.warn("DEPRECATION NOTICE: The %s module was replaced by %s" % (__oldname, __newname)) +def _formatwarning(message, category, filename, lineno): + return "%s:%s: %s: %s\n" % (filename, lineno, category.__name__, message) + +warnings.formatwarning = _formatwarning + +warnings.warn("DEPRECATION NOTICE: The %s module was replaced by %s" % (__oldname, __newname), DeprecationWarning) sys.modules[__oldname] = __realmodule diff --git a/pym/portage_dep.py b/pym/portage_dep.py index 9e5e691a9..b6c3da569 100644 --- a/pym/portage_dep.py +++ b/pym/portage_dep.py @@ -31,5 +31,10 @@ try: except ImportError, AttributeError: raise ImportError("No module named %s" % __oldname) -warnings.warn("DEPRECATION NOTICE: The %s module was replaced by %s" % (__oldname, __newname)) +def _formatwarning(message, category, filename, lineno): + return "%s:%s: %s: %s\n" % (filename, lineno, category.__name__, message) + +warnings.formatwarning = _formatwarning + +warnings.warn("DEPRECATION NOTICE: The %s module was replaced by %s" % (__oldname, __newname), DeprecationWarning) sys.modules[__oldname] = __realmodule diff --git a/pym/portage_exception.py b/pym/portage_exception.py index 9e5e691a9..b6c3da569 100644 --- a/pym/portage_exception.py +++ b/pym/portage_exception.py @@ -31,5 +31,10 @@ try: except ImportError, AttributeError: raise ImportError("No module named %s" % __oldname) -warnings.warn("DEPRECATION NOTICE: The %s module was replaced by %s" % (__oldname, __newname)) +def _formatwarning(message, category, filename, lineno): + return "%s:%s: %s: %s\n" % (filename, lineno, category.__name__, message) + +warnings.formatwarning = _formatwarning + +warnings.warn("DEPRECATION NOTICE: The %s module was replaced by %s" % (__oldname, __newname), DeprecationWarning) sys.modules[__oldname] = __realmodule diff --git a/pym/portage_gpg.py b/pym/portage_gpg.py index 9e5e691a9..b6c3da569 100644 --- a/pym/portage_gpg.py +++ b/pym/portage_gpg.py @@ -31,5 +31,10 @@ try: except ImportError, AttributeError: raise ImportError("No module named %s" % __oldname) -warnings.warn("DEPRECATION NOTICE: The %s module was replaced by %s" % (__oldname, __newname)) +def _formatwarning(message, category, filename, lineno): + return "%s:%s: %s: %s\n" % (filename, lineno, category.__name__, message) + +warnings.formatwarning = _formatwarning + +warnings.warn("DEPRECATION NOTICE: The %s module was replaced by %s" % (__oldname, __newname), DeprecationWarning) sys.modules[__oldname] = __realmodule diff --git a/pym/portage_localization.py b/pym/portage_localization.py index 9e5e691a9..b6c3da569 100644 --- a/pym/portage_localization.py +++ b/pym/portage_localization.py @@ -31,5 +31,10 @@ try: except ImportError, AttributeError: raise ImportError("No module named %s" % __oldname) -warnings.warn("DEPRECATION NOTICE: The %s module was replaced by %s" % (__oldname, __newname)) +def _formatwarning(message, category, filename, lineno): + return "%s:%s: %s: %s\n" % (filename, lineno, category.__name__, message) + +warnings.formatwarning = _formatwarning + +warnings.warn("DEPRECATION NOTICE: The %s module was replaced by %s" % (__oldname, __newname), DeprecationWarning) sys.modules[__oldname] = __realmodule diff --git a/pym/portage_locks.py b/pym/portage_locks.py index 9e5e691a9..b6c3da569 100644 --- a/pym/portage_locks.py +++ b/pym/portage_locks.py @@ -31,5 +31,10 @@ try: except ImportError, AttributeError: raise ImportError("No module named %s" % __oldname) -warnings.warn("DEPRECATION NOTICE: The %s module was replaced by %s" % (__oldname, __newname)) +def _formatwarning(message, category, filename, lineno): + return "%s:%s: %s: %s\n" % (filename, lineno, category.__name__, message) + +warnings.formatwarning = _formatwarning + +warnings.warn("DEPRECATION NOTICE: The %s module was replaced by %s" % (__oldname, __newname), DeprecationWarning) sys.modules[__oldname] = __realmodule diff --git a/pym/portage_mail.py b/pym/portage_mail.py index 9e5e691a9..b6c3da569 100644 --- a/pym/portage_mail.py +++ b/pym/portage_mail.py @@ -31,5 +31,10 @@ try: except ImportError, AttributeError: raise ImportError("No module named %s" % __oldname) -warnings.warn("DEPRECATION NOTICE: The %s module was replaced by %s" % (__oldname, __newname)) +def _formatwarning(message, category, filename, lineno): + return "%s:%s: %s: %s\n" % (filename, lineno, category.__name__, message) + +warnings.formatwarning = _formatwarning + +warnings.warn("DEPRECATION NOTICE: The %s module was replaced by %s" % (__oldname, __newname), DeprecationWarning) sys.modules[__oldname] = __realmodule diff --git a/pym/portage_manifest.py b/pym/portage_manifest.py index 9e5e691a9..b6c3da569 100644 --- a/pym/portage_manifest.py +++ b/pym/portage_manifest.py @@ -31,5 +31,10 @@ try: except ImportError, AttributeError: raise ImportError("No module named %s" % __oldname) -warnings.warn("DEPRECATION NOTICE: The %s module was replaced by %s" % (__oldname, __newname)) +def _formatwarning(message, category, filename, lineno): + return "%s:%s: %s: %s\n" % (filename, lineno, category.__name__, message) + +warnings.formatwarning = _formatwarning + +warnings.warn("DEPRECATION NOTICE: The %s module was replaced by %s" % (__oldname, __newname), DeprecationWarning) sys.modules[__oldname] = __realmodule diff --git a/pym/portage_news.py b/pym/portage_news.py index 9e5e691a9..b6c3da569 100644 --- a/pym/portage_news.py +++ b/pym/portage_news.py @@ -31,5 +31,10 @@ try: except ImportError, AttributeError: raise ImportError("No module named %s" % __oldname) -warnings.warn("DEPRECATION NOTICE: The %s module was replaced by %s" % (__oldname, __newname)) +def _formatwarning(message, category, filename, lineno): + return "%s:%s: %s: %s\n" % (filename, lineno, category.__name__, message) + +warnings.formatwarning = _formatwarning + +warnings.warn("DEPRECATION NOTICE: The %s module was replaced by %s" % (__oldname, __newname), DeprecationWarning) sys.modules[__oldname] = __realmodule diff --git a/pym/portage_selinux.py b/pym/portage_selinux.py index 9e5e691a9..b6c3da569 100644 --- a/pym/portage_selinux.py +++ b/pym/portage_selinux.py @@ -31,5 +31,10 @@ try: except ImportError, AttributeError: raise ImportError("No module named %s" % __oldname) -warnings.warn("DEPRECATION NOTICE: The %s module was replaced by %s" % (__oldname, __newname)) +def _formatwarning(message, category, filename, lineno): + return "%s:%s: %s: %s\n" % (filename, lineno, category.__name__, message) + +warnings.formatwarning = _formatwarning + +warnings.warn("DEPRECATION NOTICE: The %s module was replaced by %s" % (__oldname, __newname), DeprecationWarning) sys.modules[__oldname] = __realmodule diff --git a/pym/portage_update.py b/pym/portage_update.py index 9e5e691a9..b6c3da569 100644 --- a/pym/portage_update.py +++ b/pym/portage_update.py @@ -31,5 +31,10 @@ try: except ImportError, AttributeError: raise ImportError("No module named %s" % __oldname) -warnings.warn("DEPRECATION NOTICE: The %s module was replaced by %s" % (__oldname, __newname)) +def _formatwarning(message, category, filename, lineno): + return "%s:%s: %s: %s\n" % (filename, lineno, category.__name__, message) + +warnings.formatwarning = _formatwarning + +warnings.warn("DEPRECATION NOTICE: The %s module was replaced by %s" % (__oldname, __newname), DeprecationWarning) sys.modules[__oldname] = __realmodule diff --git a/pym/portage_util.py b/pym/portage_util.py index 9e5e691a9..b6c3da569 100644 --- a/pym/portage_util.py +++ b/pym/portage_util.py @@ -31,5 +31,10 @@ try: except ImportError, AttributeError: raise ImportError("No module named %s" % __oldname) -warnings.warn("DEPRECATION NOTICE: The %s module was replaced by %s" % (__oldname, __newname)) +def _formatwarning(message, category, filename, lineno): + return "%s:%s: %s: %s\n" % (filename, lineno, category.__name__, message) + +warnings.formatwarning = _formatwarning + +warnings.warn("DEPRECATION NOTICE: The %s module was replaced by %s" % (__oldname, __newname), DeprecationWarning) sys.modules[__oldname] = __realmodule diff --git a/pym/portage_versions.py b/pym/portage_versions.py index 9e5e691a9..b6c3da569 100644 --- a/pym/portage_versions.py +++ b/pym/portage_versions.py @@ -31,5 +31,10 @@ try: except ImportError, AttributeError: raise ImportError("No module named %s" % __oldname) -warnings.warn("DEPRECATION NOTICE: The %s module was replaced by %s" % (__oldname, __newname)) +def _formatwarning(message, category, filename, lineno): + return "%s:%s: %s: %s\n" % (filename, lineno, category.__name__, message) + +warnings.formatwarning = _formatwarning + +warnings.warn("DEPRECATION NOTICE: The %s module was replaced by %s" % (__oldname, __newname), DeprecationWarning) sys.modules[__oldname] = __realmodule -- 2.26.2