From d61e397b12aab80889e2b0981a0cb27dac0acc86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Giampaolo=20Rodol=C3=A0?= Date: Thu, 6 May 2010 20:02:37 +0000 Subject: Merged revisions 80880 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r80880 | giampaolo.rodola | 2010-05-06 21:56:34 +0200 (gio, 06 mag 2010) | 1 line provides a clearer warning message when cheap inheritance with the underlying socket object is used ........ --- Lib/asyncore.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Lib/asyncore.py b/Lib/asyncore.py index 3dad594..ac0b755 100644 --- a/Lib/asyncore.py +++ b/Lib/asyncore.py @@ -407,8 +407,9 @@ class dispatcher: raise AttributeError("%s instance has no attribute '%s'" %(self.__class__.__name__, attr)) else: - warnings.warn("cheap inheritance is deprecated", DeprecationWarning, - stacklevel=2) + msg = "%(me)s.%(attr)s is deprecated; use %(me)s.socket.%(attr)s " \ + "instead" % {'me' : self.__class__.__name__, 'attr' : attr} + warnings.warn(msg, DeprecationWarning, stacklevel=2) return retattr # log and log_info may be overridden to provide more sophisticated -- cgit v0.12