Fix sys.exc_info typo in ioloop, and typecheck for int/long in poll.

Fixes gh-46
zeromq · Nov 15, 2010 · 359c6e9 · 359c6e9
1 parent 3bb1b19
commit 359c6e9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/zmq/core/poll.pyx b/zmq/core/poll.pyx
@@ -64,7 +64,7 @@ def _poll(sockets, long timeout=-1):
             pollitems[i].socket = current_socket.handle
             pollitems[i].events = events
             pollitems[i].revents = 0
-        elif isinstance(s, int):
+        elif isinstance(s, (int,long)):
             pollitems[i].socket = NULL
             pollitems[i].fd = s
             pollitems[i].events = events

diff --git a/zmq/eventloop/ioloop.py b/zmq/eventloop/ioloop.py
@@ -252,7 +252,7 @@ def start(self):
                 else:
                     raise
             except Exception:
-                e = sys.exc_info[1]
+                e = sys.exc_info()[1]
                 # Depending on python version and IOLoop implementation,
                 # different exception types may be thrown and there are
                 # two ways EINTR might be signaled: