From f7454fa98dfe5d2c3d59437aade27b5daa6208c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Giampaolo=20Rodol=C3=A0?= <g.rodola@gmail.com>
Date: Thu, 6 May 2010 17:57:06 +0000
Subject: 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__

---
 Lib/asyncore.py           | 23 ++++++++++++++++++-----
 Lib/test/test_asyncore.py | 17 +++++++++++++++++
 Misc/NEWS                 |  7 +++++++
 3 files changed, 42 insertions(+), 5 deletions(-)

diff --git a/Lib/asyncore.py b/Lib/asyncore.py
index 6d6ca33..5aec688 100644
--- a/Lib/asyncore.py
+++ b/Lib/asyncore.py
@@ -50,6 +50,7 @@ import select
 import socket
 import sys
 import time
+import warnings
 
 import os
 from errno import EALREADY, EINPROGRESS, EWOULDBLOCK, ECONNRESET, \
@@ -61,10 +62,12 @@ except NameError:
     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
@@ -265,6 +268,8 @@ class dispatcher:
                 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:
@@ -396,7 +401,15 @@ class dispatcher:
     # 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
diff --git a/Lib/test/test_asyncore.py b/Lib/test/test_asyncore.py
index 0cf14bf..bc2dd72 100644
--- a/Lib/test/test_asyncore.py
+++ b/Lib/test/test_asyncore.py
@@ -5,6 +5,7 @@ import os
 import socket
 import sys
 import time
+import warnings
 
 from test import test_support
 from test.test_support import TESTFN, run_unittest, unlink
@@ -305,6 +306,22 @@ class DispatcherTests(unittest.TestCase):
                     'warning: unhandled accept event']
         self.assertEquals(lines, expected)
 
+    def test_issue_8594(self):
+        # XXX - this test is supposed to be removed in next major Python
+        # version
+        d = asyncore.dispatcher(socket.socket())
+        # make sure the error message no longer refers to the socket
+        # object but the dispatcher instance instead
+        self.assertRaisesRegexp(AttributeError, 'dispatcher instance',
+                                getattr, d, 'foo')
+        # cheap inheritance with the underlying socket is supposed
+        # to still work but a DeprecationWarning is expected
+        with warnings.catch_warnings(record=True) as w:
+            warnings.simplefilter("always")
+            family = d.family
+            self.assertEqual(family, socket.AF_INET)
+            self.assertTrue(len(w) == 1)
+            self.assertTrue(issubclass(w[0].category, DeprecationWarning))
 
 
 class dispatcherwithsend_noread(asyncore.dispatcher_with_send):
diff --git a/Misc/NEWS b/Misc/NEWS
index ea227a4..6d1423b 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -41,6 +41,13 @@ Core and Builtins
 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. 
+  The cheap inheritance has been deprecated.
+
 - Issue #4265: shutil.copyfile() was leaking file descriptors when disk fills.
   Patch by Tres Seaver.
 
-- 
cgit v0.12