You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rh...@apache.org on 2009/10/06 18:19:31 UTC
svn commit: r822332 - in /qpid/trunk/qpid/python/qpid: compat.py selector.py
Author: rhs
Date: Tue Oct 6 16:19:30 2009
New Revision: 822332
URL: http://svn.apache.org/viewvc?rev=822332&view=rev
Log:
compatibility changes for python 2.3
Modified:
qpid/trunk/qpid/python/qpid/compat.py
qpid/trunk/qpid/python/qpid/selector.py
Modified: qpid/trunk/qpid/python/qpid/compat.py
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/python/qpid/compat.py?rev=822332&r1=822331&r2=822332&view=diff
==============================================================================
--- qpid/trunk/qpid/python/qpid/compat.py (original)
+++ qpid/trunk/qpid/python/qpid/compat.py Tue Oct 6 16:19:30 2009
@@ -17,6 +17,8 @@
# under the License.
#
+import sys
+
try:
set = set
except NameError:
@@ -30,6 +32,13 @@
try:
from traceback import format_exc
except ImportError:
- import sys, traceback
+ import traceback
def format_exc():
return "".join(traceback.format_exception(*sys.exc_info()))
+
+if tuple(sys.version_info[0:2]) < (2, 4):
+ from select import select as old_select
+ def select(rlist, wlist, xlist, timeout=None):
+ return old_select(list(rlist), list(wlist), list(xlist), timeout)
+else:
+ from select import select
Modified: qpid/trunk/qpid/python/qpid/selector.py
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/python/qpid/selector.py?rev=822332&r1=822331&r2=822332&view=diff
==============================================================================
--- qpid/trunk/qpid/python/qpid/selector.py (original)
+++ qpid/trunk/qpid/python/qpid/selector.py Tue Oct 6 16:19:30 2009
@@ -17,7 +17,7 @@
# under the License.
#
import atexit, os, time
-from select import select
+from compat import select, set
from threading import Thread, Lock
class Acceptor:
@@ -84,10 +84,7 @@
self.thread = None
def wakeup(self):
- while True:
- select([], [self.wakeup_fd], [])
- if os.write(self.wakeup_fd, "\0") > 0:
- break
+ os.write(self.wakeup_fd, "\0")
def register(self, selectable):
self.selectables.add(selectable)
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org