diff options
| author | Giampaolo Rodolà <g.rodola@gmail.com> | 2010-11-01 15:18:09 (GMT) |
|---|---|---|
| committer | Giampaolo Rodolà <g.rodola@gmail.com> | 2010-11-01 15:18:09 (GMT) |
| commit | 5ea3d0f95b51009fa1c3409e7dd1c12006427ccc (patch) | |
| tree | d532cf8a8c9b9fccd3f8cf7738a1716a4e3662f5 /Lib/asyncore.py | |
| parent | 8581c7e11a2e38c076fc3d96f30fce394ff1ce69 (diff) | |
| download | cpython-5ea3d0f95b51009fa1c3409e7dd1c12006427ccc.zip cpython-5ea3d0f95b51009fa1c3409e7dd1c12006427ccc.tar.gz cpython-5ea3d0f95b51009fa1c3409e7dd1c12006427ccc.tar.bz2 | |
Fix Issue 6706: return None on connect() in case of EWOULDBLOCK/ECONNABORTED error.
Diffstat (limited to 'Lib/asyncore.py')
| -rw-r--r-- | Lib/asyncore.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Lib/asyncore.py b/Lib/asyncore.py index 7f06e43..861495d 100644 --- a/Lib/asyncore.py +++ b/Lib/asyncore.py @@ -346,12 +346,15 @@ class dispatcher: # XXX can return either an address pair or None try: conn, addr = self.socket.accept() - return conn, addr + except TypeError: + return None except socket.error as why: - if why.args[0] == EWOULDBLOCK: - pass + if why.args[0] in (EWOULDBLOCK, ECONNABORTED): + return None else: raise + else: + return conn, addr def send(self, data): try: |