diff options
| -rw-r--r-- | Lib/asyncore.py | 4 | ||||
| -rw-r--r-- | Lib/test/test_asyncore.py | 9 |
2 files changed, 11 insertions, 2 deletions
diff --git a/Lib/asyncore.py b/Lib/asyncore.py index 07d5311d5f..ee0a049c17 100644 --- a/Lib/asyncore.py +++ b/Lib/asyncore.py @@ -62,8 +62,8 @@ except NameError: def _strerror(err): try: - return strerror(err) - except (ValueError, OverflowError): + return os.strerror(err) + except (ValueError, OverflowError, NameError): if err in errorcode: return errorcode[err] return "Unknown error %s" %err diff --git a/Lib/test/test_asyncore.py b/Lib/test/test_asyncore.py index 670ee43909..ebc2adbfa2 100644 --- a/Lib/test/test_asyncore.py +++ b/Lib/test/test_asyncore.py @@ -6,6 +6,7 @@ import socket import threading import sys import time +import errno from test import test_support from test.test_support import TESTFN, run_unittest, unlink @@ -314,6 +315,14 @@ class DispatcherTests(unittest.TestCase): # test cheap inheritance with the underlying socket self.assertEqual(d.family, socket.AF_INET) + def test_strerror(self): + # refers to bug #8573 + err = asyncore._strerror(errno.EPERM) + if hasattr(os, 'strerror'): + self.assertEqual(err, os.strerror(errno.EPERM)) + err = asyncore._strerror(-1) + self.assertTrue("unknown error" in err.lower()) + class dispatcherwithsend_noread(asyncore.dispatcher_with_send): def readable(self): |