support python 3

stompy/frame.py

@@ -2,8 +2,12 @@
 import random
 from pprint import pformat
 from errno import EAGAIN, EWOULDBLOCK
-from Queue import Queue
-from Queue import Empty as QueueEmpty
+if sys.version_info[0] < 3:
+    from Queue import Queue
+    from Queue import Empty as QueueEmpty
+else:
+    from queue import Queue
+    from queue import Empty as QueueEmpty
 
 
 class UnknownBrokerResponseError(Exception):
@@ -268,7 +272,7 @@ def _getline(self, nb=False):
                     partial = self.sock.recv(1)
                     if not partial or partial == '':
                         raise UnknownBrokerResponseError('empty reply')
-                except socket.error, exc:
+                except socket.error as exc:
                     if exc[0] == EAGAIN or exc[0] == EWOULDBLOCK:
                         if not buffer or buffer == '\n':
                             raise UnknownBrokerResponseError('empty reply')

stompy/simple.py

@@ -1,5 +1,8 @@
 from stompy.stomp import Stomp
-from Queue import Empty
+if sys.version_info[0] < 3:
+    from Queue import Queue
+else:
+    from queue import Queue
 from uuid import uuid4
 
 

stompy/stomp.py

@@ -46,9 +46,9 @@ def connect(self, username=None, password=None, clientid=None):
         try:
             self.sock.connect((self.host, self.port))
             self.frame.connect(self.sock, username=username, password=password, clientid=clientid)
-        except socket.timeout, exc:
+        except socket.timeout as exc:
             raise self.ConnectionTimeoutError(*exc.args)
-        except socket.error, exc:
+        except socket.error as exc:
             raise self.ConnectionError(*exc.args)
         self.connected = True
 
@@ -63,7 +63,7 @@ def disconnect(self, conf=None):
         try:
             self.sock.shutdown(0)
             self.sock.close()
-        except socket.error, exc:
+        except socket.error as exc:
             # likely wasn't connected
             pass
         self.connected = False

tests/test_frame.py

@@ -6,7 +6,10 @@
 from stompy import frame
 from stompy.frame import Frame, IntermediateMessageQueue, \
         UnknownBrokerResponseError, BrokerErrorResponse
-from Queue import Empty as QueueEmpty
+if sys.version_info[0] < 3:
+    from Queue import Empty as QueueEmpty
+else:
+    from queue import Empty as QueueEmpty
 
 
 class WhenSettingUp(DingusTestCase(Frame)):