From 170decec77cdd1329cbb3f36a496978640a27703 Mon Sep 17 00:00:00 2001
From: Keith Wall <kwall@apache.org>
Date: Mon, 23 Feb 2015 11:52:12 +0000
Subject: QPID-6405: [Python Client] Fallback if pkg_resources is not
 available.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1661647 13f79535-47bb-0310-9956-ffa450edef68
---
 qpid/python/qpid/util.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'qpid/python')

diff --git a/qpid/python/qpid/util.py b/qpid/python/qpid/util.py
index fb343b536a..41c5852d14 100644
--- a/qpid/python/qpid/util.py
+++ b/qpid/python/qpid/util.py
@@ -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(provided_client_properties={}, version_p
     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:
-- 
cgit v1.2.1