Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Fix issue #8573 (asyncore._strerror bug): fixed os.strerror typo; included NameError in the tuple of expected exception; added test case for asyncore._strerror.

This commit is contained in:
Giampaolo Rodolà 2010-05-18 20:04:31 +00:00
parent cccfce1959
commit e3a84e857f
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Lib/asyncore.py
View File

@ -63,8 +63,8 @@ except NameError:
def _strerror(err): def _strerror(err):
try: try:
return strerror(err) return os.strerror(err)
except (ValueError, OverflowError): except (ValueError, OverflowError, NameError):
if err in errorcode: if err in errorcode:
return errorcode[err] return errorcode[err]
return "Unknown error %s" %err return "Unknown error %s" %err

9
Lib/test/test_asyncore.py
View File

@ -6,6 +6,7 @@ import socket
import sys import sys
import time import time
import warnings import warnings
import errno
from test import test_support from test import test_support
from test.test_support import TESTFN, run_unittest, unlink from test.test_support import TESTFN, run_unittest, unlink
@ -323,6 +324,14 @@ class DispatcherTests(unittest.TestCase):
self.assertTrue(len(w) == 1) self.assertTrue(len(w) == 1)
self.assertTrue(issubclass(w[0].category, DeprecationWarning)) self.assertTrue(issubclass(w[0].category, DeprecationWarning))
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): class dispatcherwithsend_noread(asyncore.dispatcher_with_send):
def readable(self): def readable(self):