From: Giampaolo Rodolà <g.rodola@gmail.com>
Date: Thu, 3 Mar 2011 14:11:46 +0000 (+0000)
Subject: Merged revisions 88726 via svnmerge from
X-Git-Tag: v3.2.1b1~352
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=00a42865912a8f3becdbb1dfc5331e3a7495ba82;p=thirdparty%2FPython%2Fcpython.git

Merged revisions 88726 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r88726 | giampaolo.rodola | 2011-03-03 15:10:58 +0100 (gio, 03 mar 2011) | 1 line

  fix attribute error
........
---

diff --git a/Lib/asyncore.py b/Lib/asyncore.py
index 0ad78db714d0..5d7bddaf84c4 100644
--- a/Lib/asyncore.py
+++ b/Lib/asyncore.py
@@ -54,7 +54,8 @@ import warnings
 
 import os
 from errno import EALREADY, EINPROGRESS, EWOULDBLOCK, ECONNRESET, EINVAL, \
-     ENOTCONN, ESHUTDOWN, EINTR, EISCONN, EBADF, ECONNABORTED, EPIPE, errorcode
+     ENOTCONN, ESHUTDOWN, EINTR, EISCONN, EBADF, ECONNABORTED, EPIPE, EAGAIN, \
+     errorcode
 
 _DISCONNECTED = frozenset((ECONNRESET, ENOTCONN, ESHUTDOWN, ECONNABORTED, EPIPE,
                            EBADF))