diff options
| author | Alan Conway <aconway@apache.org> | 2010-11-08 16:50:39 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2010-11-08 16:50:39 +0000 |
| commit | bbca55dd6d48f982a81aa57e890ed67526964add (patch) | |
| tree | acfee3fe76d3dc45a8e17184d93c293e4b7c53b9 /qpid/python | |
| parent | e71532fc66f00535f330772bb2821a1b016d680a (diff) | |
| download | qpid-python-bbca55dd6d48f982a81aa57e890ed67526964add.tar.gz | |
Fix brokertest errors like: "poll() got an unexpected keyword argument '_deadstate'"
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1032636 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/python')
| -rw-r--r-- | qpid/python/qpid/brokertest.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qpid/python/qpid/brokertest.py b/qpid/python/qpid/brokertest.py index 8cf05c8161..6222b0b521 100644 --- a/qpid/python/qpid/brokertest.py +++ b/qpid/python/qpid/brokertest.py @@ -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() |