diff options
| author | Giampaolo Rodolà <g.rodola@gmail.com> | 2010-05-18 20:13:43 (GMT) |
|---|---|---|
| committer | Giampaolo Rodolà <g.rodola@gmail.com> | 2010-05-18 20:13:43 (GMT) |
| commit | 19531db0b8cb2c7926453d935615cbd2eb687ed1 (patch) | |
| tree | 2d6309245bca7dc11f99f46a6fc5a1f224b8f4e2 /Lib/asyncore.py | |
| parent | bb35b21bce90e6a9c75367a7345e293b69fd9745 (diff) | |
| download | cpython-19531db0b8cb2c7926453d935615cbd2eb687ed1.zip cpython-19531db0b8cb2c7926453d935615cbd2eb687ed1.tar.gz cpython-19531db0b8cb2c7926453d935615cbd2eb687ed1.tar.bz2 | |
Merged revisions 81299 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r81299 | giampaolo.rodola | 2010-05-18 22:11:58 +0200 (mar, 18 mag 2010) | 9 lines
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.
........
................
Diffstat (limited to 'Lib/asyncore.py')
| -rw-r--r-- | Lib/asyncore.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/asyncore.py b/Lib/asyncore.py index 8884501..44e8918 100644 --- a/Lib/asyncore.py +++ b/Lib/asyncore.py @@ -61,8 +61,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 |