From 1f8fc10661961d2538e971b0ba286c3f718eacb6 Mon Sep 17 00:00:00 2001
From: Roy Hyunjin Han <support@invisibleroads.com>
Date: Thu, 19 Apr 2012 17:03:30 -0400
Subject: [PATCH] Added exception handling to destructor in case of connection
 failure

---
 CHANGES.rst           |   8 ++++++--
 setup.py              |   2 +-
 socketIO/__init__.py  |   7 +++++--
 socketIO/__init__.pyc | Bin 3934 -> 0 bytes
 4 files changed, 12 insertions(+), 5 deletions(-)
 delete mode 100644 socketIO/__init__.pyc

diff --git a/CHANGES.rst b/CHANGES.rst
index e1fd6da..551eacc 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,7 @@
-0.1
----
+0.1.1
+-----
+- Added exception handling to destructor in case of connection failure
+
+0.1.0
+-----
 - Wrapped code from `StackOverflow <http://stackoverflow.com/questions/6692908/formatting-messages-to-send-to-socket-io-node-js-server-from-python-client/>`_
diff --git a/setup.py b/setup.py
index babba77..35d6170 100644
--- a/setup.py
+++ b/setup.py
@@ -10,7 +10,7 @@ CHANGES = open(os.path.join(here, 'CHANGES.rst')).read()
 
 setup(
     name='socketIO-client',
-    version='0.1',
+    version='0.1.1',
     description='Barebones socket.io client library',
     long_description=README + '\n\n' +  CHANGES,
     license='MIT',
diff --git a/socketIO/__init__.py b/socketIO/__init__.py
index 1299268..f27e324 100644
--- a/socketIO/__init__.py
+++ b/socketIO/__init__.py
@@ -31,8 +31,11 @@ class SocketIO(object):
         self.connection = create_connection('ws://%s:%d/socket.io/1/websocket/%s' % (self.host, self.port, self.sessionID))
 
     def __del__(self):
-        self.heartbeatThread.cancel()
-        self.connection.close()
+        try:
+            self.heartbeatThread.cancel()
+            self.connection.close()
+        except AttributeError:
+            pass
 
     def __send_heartbeat(self):
         self.connection.send('2::')
diff --git a/socketIO/__init__.pyc b/socketIO/__init__.pyc
deleted file mode 100644
index eee6ebe432f572eb0b4bacb2de8ab0a082b0977e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3934
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
I+U2$SKfMMbVgLXD