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
........
This commit is contained in:
Giampaolo Rodolà 2010-05-06 20:02:37 +00:00
parent 8d2dc85154
commit d61e397b12

View file

@ -407,8 +407,9 @@ class dispatcher:
raise AttributeError("%s instance has no attribute '%s'" raise AttributeError("%s instance has no attribute '%s'"
%(self.__class__.__name__, attr)) %(self.__class__.__name__, attr))
else: else:
warnings.warn("cheap inheritance is deprecated", DeprecationWarning, msg = "%(me)s.%(attr)s is deprecated; use %(me)s.socket.%(attr)s " \
stacklevel=2) "instead" % {'me' : self.__class__.__name__, 'attr' : attr}
warnings.warn(msg, DeprecationWarning, stacklevel=2)
return retattr return retattr
# log and log_info may be overridden to provide more sophisticated # log and log_info may be overridden to provide more sophisticated