summaryrefslogtreecommitdiff
path: root/qpid/tools/src
diff options
context:
space:
mode:
authorDarryl L. Pierce <mcpierce@apache.org>2013-10-15 13:10:38 +0000
committerDarryl L. Pierce <mcpierce@apache.org>2013-10-15 13:10:38 +0000
commit02b136e430d0b8ccfb183d60465c640d99bc8fa9 (patch)
tree3c24514e08bd9ea4bc31116f4ea89a12e28ffadb /qpid/tools/src
parent6aa3b0121912f455370c9824f6bd3dc24a78318e (diff)
downloadqpid-python-02b136e430d0b8ccfb183d60465c640d99bc8fa9.tar.gz
Revert "QPID-5213: Fix QMF code to use qpid_messaging rather than cqpid."
This reverts commit 067e9aa1656b9f92e5910bbb6d530f9df6d0dad3. It had the wrong JIRA number in the commit. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1532323 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/tools/src')
-rwxr-xr-xqpid/tools/src/py/qmf-tool4
1 files changed, 2 insertions, 2 deletions
diff --git a/qpid/tools/src/py/qmf-tool b/qpid/tools/src/py/qmf-tool
index 407ae74b10..db51c96796 100755
--- a/qpid/tools/src/py/qmf-tool
+++ b/qpid/tools/src/py/qmf-tool
@@ -28,7 +28,7 @@ from shlex import split
from threading import Lock
from time import strftime, gmtime
from qpid.disp import Display
-import qpid_messaging
+import cqpid
import qmf2
class OptsAndArgs(object):
@@ -266,7 +266,7 @@ class QmfData:
self.conn_options = conn_options
self.qmf_options = qmf_options
self.agent_filter = '[]'
- self.connection = qpid_messaging.Connection(self.url, **self.conn_options)
+ self.connection = cqpid.Connection(self.url, **self.conn_options)
self.connection.open()
self.session = qmf2.ConsoleSession(self.connection, self.qmf_options)
self.session.setAgentFilter(self.agent_filter)