traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merged revisions 81294 via svnmerge from 

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81294 | giampaolo.rodola | 2010-05-18 22:04:31 +0200 (mar, 18 mag 2010) | 1 line

  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:11:58 +00:00
parent 8fddc9e788
commit 82e02b5876
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 support from test import support
from test.support import TESTFN, run_unittest, unlink from test.support import TESTFN, run_unittest, unlink
@ -324,6 +325,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):