Merged revisions 80875 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r80875 | giampaolo.rodola | 2010-05-06 19:57:06 +0200 (gio, 06 mag 2010) | 1 line
Fix asyncore issues 8573 and 8483: _strerror might throw ValueError; asyncore.__getattr__ cheap inheritance caused confusing error messages when accessing undefined class attributes; added an alias for __str__ which now is used as a fallback for __repr__
........
diff --git a/Lib/asyncore.py b/Lib/asyncore.py
index db426d7..3dad594 100644
--- a/Lib/asyncore.py
+++ b/Lib/asyncore.py
@@ -50,6 +50,8 @@
import socket
import sys
import time
+import warnings
+
import os
from errno import EALREADY, EINPROGRESS, EWOULDBLOCK, ECONNRESET, \
ENOTCONN, ESHUTDOWN, EINTR, EISCONN, EBADF, ECONNABORTED, errorcode
@@ -60,10 +62,12 @@
socket_map = {}
def _strerror(err):
- res = os.strerror(err)
- if res == 'Unknown error':
- res = errorcode[err]
- return res
+ try:
+ return strerror(err)
+ except (ValueError, OverflowError):
+ if err in errorcode:
+ return errorcode[err]
+ return "Unknown error %s" %err
class ExitNow(Exception):
pass
@@ -264,6 +268,8 @@
status.append(repr(self.addr))
return '<%s at %#x>' % (' '.join(status), id(self))
+ __str__ = __repr__
+
def add_channel(self, map=None):
#self.log_info('adding channel %s' % self)
if map is None:
@@ -395,7 +401,15 @@
# cheap inheritance, used to pass all other attribute
# references to the underlying socket object.
def __getattr__(self, attr):
- return getattr(self.socket, attr)
+ try:
+ retattr = getattr(self.socket, attr)
+ except AttributeError:
+ raise AttributeError("%s instance has no attribute '%s'"
+ %(self.__class__.__name__, attr))
+ else:
+ warnings.warn("cheap inheritance is deprecated", DeprecationWarning,
+ stacklevel=2)
+ return retattr
# log and log_info may be overridden to provide more sophisticated
# logging and warning methods. In general, log is for 'hit' logging