From d6132b43d2c29a2783ea9aab83c29a7d84e37f97 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Mon, 12 Jan 2009 08:06:04 +0000 Subject: Bug #252840 - Fix TypeError which is triggered by a broken override of varnings.formatwarning(). Override warnings.showwarning() instead since the api docs say it may be overriden while they do not say this about formatwarning(). (trunk r12363) svn path=/main/branches/2.1.6/; revision=12434 --- pym/portage_compat_namespace.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pym/portage_compat_namespace.py b/pym/portage_compat_namespace.py index 07f22a95e..6956ec2b3 100644 --- a/pym/portage_compat_namespace.py +++ b/pym/portage_compat_namespace.py @@ -31,10 +31,15 @@ try: except (ImportError, AttributeError): raise ImportError("No module named %s" % __oldname) -def _formatwarning(message, category, filename, lineno): - return "%s:%s: %s: %s\n" % (filename, lineno, category.__name__, message) - -warnings.formatwarning = _formatwarning +def _showwarning(message, category, filename, lineno, file=None, line=None): + if file is None: + 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 -- cgit v1.2.3-1-g7c22