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 4f1153b..07d5311 100644
--- a/Lib/asyncore.py
+++ b/Lib/asyncore.py
@@ -61,10 +61,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
@@ -391,7 +393,11 @@
# cheap inheritance, used to pass all other attribute
# references to the underlying socket object.
def __getattr__(self, attr):
- return getattr(self.socket, attr)
+ try:
+ return getattr(self.socket, attr)
+ except AttributeError:
+ raise AttributeError("%s instance has no attribute '%s'"
+ %(self.__class__.__name__, attr))
# log and log_info may be overridden to provide more sophisticated
# logging and warning methods. In general, log is for 'hit' logging
diff --git a/Lib/test/test_asyncore.py b/Lib/test/test_asyncore.py
index ce835aa..670ee43 100644
--- a/Lib/test/test_asyncore.py
+++ b/Lib/test/test_asyncore.py
@@ -301,6 +301,18 @@
'warning: unhandled accept event']
self.assertEquals(lines, expected)
+ def test_issue_8594(self):
+ d = asyncore.dispatcher(socket.socket())
+ # make sure the error message no longer refers to the socket
+ # object but the dispatcher instance instead
+ try:
+ d.foo
+ except AttributeError, err:
+ self.assertTrue('dispatcher instance' in str(err))
+ else:
+ self.fail("exception not raised")
+ # test cheap inheritance with the underlying socket
+ self.assertEqual(d.family, socket.AF_INET)
class dispatcherwithsend_noread(asyncore.dispatcher_with_send):
diff --git a/Misc/NEWS b/Misc/NEWS
index 7bafbbe..8e33eb9 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -33,6 +33,12 @@
Library
-------
+- Issue #8573: asyncore _strerror() function might throw ValueError.
+
+- Issue #8483: asyncore.dispatcher's __getattr__ method produced confusing
+ error messages when accessing undefined class attributes because of the cheap
+ inheritance with the underlying socket object.
+
- Issue #4265: shutil.copyfile() was leaking file descriptors when disk fills.
Patch by Tres Seaver.