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 | 44aee33cb26d852b5e5d1bbd079472cb693a2b75 (patch) | |
| tree | 0281c047c520f449da17c293d5eadfe3f8640b37 /python | |
| parent | f3c91fde768be25f1ab552f43f22b0158161a120 (diff) | |
| download | qpid-python-44aee33cb26d852b5e5d1bbd079472cb693a2b75.tar.gz | |
Fix brokertest errors like: "poll() got an unexpected keyword argument '_deadstate'"
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1032636 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'python')
| -rw-r--r-- | python/qpid/brokertest.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/python/qpid/brokertest.py b/python/qpid/brokertest.py index 8cf05c8161..6222b0b521 100644 --- a/python/qpid/brokertest.py +++ b/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() |
