Do not raise exception on close() on account of socket attribute still being None:

giampaolo · giampaolo · commit a4c377cde9b0 · 2013-04-09T17:21:25.000+02:00
&gt;&gt;&gt; import asyncore
&gt;&gt;&gt; d = asyncore.dispatcher()
&gt;&gt;&gt; d.close()
Traceback (most recent call last):
  File "&lt;stdin&gt;", line 1, in &lt;module&gt;
  File "/usr/local/lib/python3.4/asyncore.py", line 401, in close
    self.socket.close()
AttributeError: 'NoneType' object has no attribute 'close'
&gt;&gt;&gt;
diff --git a/Lib/asyncore.py b/Lib/asyncore.py
@@ -397,11 +397,12 @@ def close(self):
         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.
