summaryrefslogtreecommitdiff
path: root/python
diff options
context:
space:
mode:
authorKeith Wall <kwall@apache.org>2015-03-01 07:33:14 +0000
committerKeith Wall <kwall@apache.org>2015-03-01 07:33:14 +0000
commit0fb188f1759fcd4323a43290094e076aa891025d (patch)
treedac54310ab68662370f1baebcdf6128b0434b351 /python
parent8e659c85f1bd4973893865527afbc51ca5dde74f (diff)
downloadqpid-python-0fb188f1759fcd4323a43290094e076aa891025d.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/qpid@1663039 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'python')
-rw-r--r--python/qpid/util.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/python/qpid/util.py b/python/qpid/util.py
index 41c5852d14..b17f13e6e6 100644
--- a/python/qpid/util.py
+++ b/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