commit 0f344b6e0526245249b80219e6001616307d2b35
author Giampaolo Rodola' <g.rodola@gmail.com> Tue Apr 09 17:23:27 2013 +0200
committer Giampaolo Rodola' <g.rodola@gmail.com> Tue Apr 09 17:23:27 2013 +0200
tree fcac81eda1a80570a03614d71366bd1295e58b07
parent a4c377cde9b010f6bee5e5e0a15e8545228d31e2
parent 7005b1f90a42c9187ff9b93a7be0244ef94af8a1

merge heads

Lib/asyncore.py

diff --git a/Lib/asyncore.py b/Lib/asyncore.py
index f146643..75481dd 100644
--- a/Lib/asyncore.py
+++ b/Lib/asyncore.py
@@ -397,11 +397,12 @@
         self.accepting = False
         self.connecting = False
         self.del_channel()
-        try:
-            self.socket.close()
-        except OSError as why:
-            if why.args[0] not in (ENOTCONN, EBADF):
-                raise
+        if self.socket is not None:
+            try:
+                self.socket.close()
+            except OSError as why:
+                if why.args[0] not in (ENOTCONN, EBADF):
+                    raise
 
     # cheap inheritance, used to pass all other attribute
     # references to the underlying socket object.