[Python-checkins] r80881 - in python/branches/py3k: Lib/asyncore.py

giampaolo.rodola python-checkins at python.org
Thu May 6 22:02:37 CEST 2010


Author: giampaolo.rodola
Date: Thu May  6 22:02:37 2010
New Revision: 80881

Log:
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
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Lib/asyncore.py

Modified: python/branches/py3k/Lib/asyncore.py
==============================================================================
--- python/branches/py3k/Lib/asyncore.py	(original)
+++ python/branches/py3k/Lib/asyncore.py	Thu May  6 22:02:37 2010
@@ -407,8 +407,9 @@
             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


More information about the Python-checkins mailing list