summaryrefslogtreecommitdiffstats
path: root/Lib/asyncore.py
diff options
context:
space:
mode:
authorGiampaolo RodolĂ  <g.rodola@gmail.com>2010-05-18 20:11:58 (GMT)
committerGiampaolo RodolĂ  <g.rodola@gmail.com>2010-05-18 20:11:58 (GMT)
commit82e02b587620354de092fbd1ff364f1b5d97f330 (patch)
tree0c8f5c2274d4605a778fdf2a62535032e982fb01 /Lib/asyncore.py
parent8fddc9e788dde0ff92ee52732c53a9fcec96ca05 (diff)
downloadcpython-82e02b587620354de092fbd1ff364f1b5d97f330.zip
cpython-82e02b587620354de092fbd1ff364f1b5d97f330.tar.gz
cpython-82e02b587620354de092fbd1ff364f1b5d97f330.tar.bz2
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.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/asyncore.py b/Lib/asyncore.py
index ac0b755..c2ec259 100644
--- a/Lib/asyncore.py
+++ b/Lib/asyncore.py
@@ -63,8 +63,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