You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2010/11/08 17:50:39 UTC
svn commit: r1032636 - /qpid/trunk/qpid/python/qpid/brokertest.py
Author: aconway
Date: Mon Nov 8 16:50:39 2010
New Revision: 1032636
URL: http://svn.apache.org/viewvc?rev=1032636&view=rev
Log:
Fix brokertest errors like: "poll() got an unexpected keyword argument '_deadstate'"
Modified:
qpid/trunk/qpid/python/qpid/brokertest.py
Modified: qpid/trunk/qpid/python/qpid/brokertest.py
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/python/qpid/brokertest.py?rev=1032636&r1=1032635&r2=1032636&view=diff
==============================================================================
--- qpid/trunk/qpid/python/qpid/brokertest.py (original)
+++ qpid/trunk/qpid/python/qpid/brokertest.py Mon Nov 8 16:50:39 2010
@@ -227,9 +227,9 @@ class Popen(subprocess.Popen):
def assert_running(self):
if not self.is_running(): self.unexpected("Exit code %d" % self.returncode)
- def poll(self):
+ def poll(self, _deadstate=None): # _deadstate required by base class in python 2.4
if self.returncode is None:
- ret = subprocess.Popen.poll(self)
+ ret = subprocess.Popen.poll(self, _deadstate)
if (ret != -1):
self.returncode = ret
self._cleanup()
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org