diff options
| author | Ernest Allen <eallen@apache.org> | 2015-09-02 16:58:28 +0000 |
|---|---|---|
| committer | Ernest Allen <eallen@apache.org> | 2015-09-02 16:58:28 +0000 |
| commit | 6ab46a1bd6dc52378b3c996fb45776e0e84b708f (patch) | |
| tree | 45124ee9cb65f958430fb9a8e25f491a66751de1 /qpid/python | |
| parent | 515609c7f9ee2de53ae7aa5a29aee6ceb3ebde43 (diff) | |
| download | qpid-python-6ab46a1bd6dc52378b3c996fb45776e0e84b708f.tar.gz | |
NO-JIRA: Fix for python client ValueError exception. see bz1249608
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1700852 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/python')
| -rw-r--r-- | qpid/python/qpid/compat.py | 1 | ||||
| -rw-r--r-- | qpid/python/qpid/selector.py | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/qpid/python/qpid/compat.py b/qpid/python/qpid/compat.py index 12966c2383..89e378791e 100644 --- a/qpid/python/qpid/compat.py +++ b/qpid/python/qpid/compat.py @@ -105,6 +105,7 @@ if hasattr(_select_mod, "poll") and not _is_patched: return (rfds, wfds, xfds) else: if tuple(sys.version_info[0:2]) < (2, 4): + from select import error as SelectError from select import select as old_select def select(rlist, wlist, xlist, timeout=None): return old_select(list(rlist), list(wlist), list(xlist), timeout) diff --git a/qpid/python/qpid/selector.py b/qpid/python/qpid/selector.py index d2f4c1fc88..719dd84893 100644 --- a/qpid/python/qpid/selector.py +++ b/qpid/python/qpid/selector.py @@ -17,7 +17,7 @@ # under the License. # import atexit, time, errno, os -from compat import select, set, selectable_waiter +from compat import select, SelectError, set, selectable_waiter from threading import Thread, Lock class Acceptor: @@ -125,9 +125,9 @@ class Selector: timeout = max(0, wakeup - time.time()) rd, wr, ex = select(self.reading, self.writing, (), timeout) break - except Exception, (err, strerror): + except SelectError, e: # Repeat the select call if we were interrupted. - if err == errno.EINTR: + if e[0] == errno.EINTR: continue else: raise |