You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2015/02/23 12:52:12 UTC
svn commit: r1661647 - /qpid/trunk/qpid/python/qpid/util.py
Author: kwall
Date: Mon Feb 23 11:52:12 2015
New Revision: 1661647
URL: http://svn.apache.org/r1661647
Log:
QPID-6405: [Python Client] Fallback if pkg_resources is not available.
Modified:
qpid/trunk/qpid/python/qpid/util.py
Modified: qpid/trunk/qpid/python/qpid/util.py
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/python/qpid/util.py?rev=1661647&r1=1661646&r2=1661647&view=diff
==============================================================================
--- qpid/trunk/qpid/python/qpid/util.py (original)
+++ qpid/trunk/qpid/python/qpid/util.py Mon Feb 23 11:52:12 2015
@@ -17,7 +17,7 @@
# under the License.
#
-import os, socket, time, textwrap, re, sys, pkg_resources
+import os, socket, time, textwrap, re, sys
try:
from ssl import wrap_socket as ssl
@@ -51,6 +51,7 @@ def get_client_properties_with_defaults(
pass
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
except:
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org