diff options
| author | Keith Wall <kwall@apache.org> | 2015-03-01 07:33:14 +0000 |
|---|---|---|
| committer | Keith Wall <kwall@apache.org> | 2015-03-01 07:33:14 +0000 |
| commit | 36d2c895515960b4fa4c864f2816963ad63bab2e (patch) | |
| tree | 2b50372fe0f862f8649181136f7b3a642ba0ba22 | |
| parent | 4f2766456a3856b6c6dd120ffadfdc65c7066798 (diff) | |
| download | qpid-python-36d2c895515960b4fa4c864f2816963ad63bab2e.tar.gz | |
QPID-6405: Dont't use a Python Conditional Expression to maintain compatibility with Python 2.4
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1663039 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/python/qpid/util.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/qpid/python/qpid/util.py b/qpid/python/qpid/util.py index 41c5852d14..b17f13e6e6 100644 --- a/qpid/python/qpid/util.py +++ b/qpid/python/qpid/util.py @@ -53,7 +53,8 @@ def get_client_properties_with_defaults(provided_client_properties={}, version_p try: import pkg_resources pkg = pkg_resources.require("qpid-python") - version = pkg[0].version if pkg and pkg[0] and pkg[0].version else version + if pkg and pkg[0] and pkg[0].version: + version = pkg[0].version except: pass |