You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2015/01/23 22:33:50 UTC
svn commit: r1654394 -
/qpid/dispatch/trunk/python/qpid_dispatch/management/client.py
Author: aconway
Date: Fri Jan 23 21:33:50 2015
New Revision: 1654394
URL: http://svn.apache.org/r1654394
Log:
NO-JIRA: Use proton.utils if it exists, fall back to qpid_dispatch_internal.proton_future.utils if not.
Modified:
qpid/dispatch/trunk/python/qpid_dispatch/management/client.py
Modified: qpid/dispatch/trunk/python/qpid_dispatch/management/client.py
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/python/qpid_dispatch/management/client.py?rev=1654394&r1=1654393&r2=1654394&view=diff
==============================================================================
--- qpid/dispatch/trunk/python/qpid_dispatch/management/client.py (original)
+++ qpid/dispatch/trunk/python/qpid_dispatch/management/client.py Fri Jan 23 21:33:50 2015
@@ -26,7 +26,10 @@ import proton, threading
from proton import Url
from .error import *
from .entity import EntityBase, clean_dict
-from qpid_dispatch_internal.proton_future.utils import SyncRequestResponse, BlockingConnection
+try:
+ from proton.utils import SyncRequestResponse, BlockingConnection
+except ImportError:
+ from qpid_dispatch_internal.proton_future.utils import SyncRequestResponse, BlockingConnection
class Entity(EntityBase):
@@ -96,7 +99,7 @@ class Node(object):
def close(self):
"""Shut down the node"""
if self.client:
- self.client.close()
+ self.client.connection.close()
self.client = None
def __repr__(self):
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org