summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAsk Solem <ask@celeryproject.org>2014-03-05 13:04:21 +0000
committerAsk Solem <ask@celeryproject.org>2014-04-15 22:06:11 +0100
commitd4433486cb7513ca2a014ce30cb52d91357e9ea1 (patch)
treed1f7e776701b70772cdd1e404828310c69860a48
parent78d71d201559644338b5bf6364762184a6d3d5b0 (diff)
downloadpy-amqp-d4433486cb7513ca2a014ce30cb52d91357e9ea1.tar.gz
Fix for Transport.__del__ for late threads at shutdown. Closes #36
-rw-r--r--amqp/transport.py10
1 files changed, 7 insertions, 3 deletions
diff --git a/amqp/transport.py b/amqp/transport.py
index 8acdd4a..30ecd3e 100644
--- a/amqp/transport.py
+++ b/amqp/transport.py
@@ -109,9 +109,13 @@ class _AbstractTransport(object):
def __del__(self):
try:
- self.close()
- except socket.error:
- pass
+ # socket module may have been collected by gc
+ # if this is called by a thread at shutdown.
+ if socket is not None:
+ try:
+ self.close()
+ except socket.error:
+ pass
finally:
self.sock = None