From 888581cb9781259073d190edede25e6253ec7dd9 Mon Sep 17 00:00:00 2001 From: Kim van der Riet Date: Mon, 21 Oct 2013 22:04:51 +0000 Subject: QPID-4984: WIP - Merge from trunk r.1534385. git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/linearstore@1534394 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/bindings/qmf2/python/qmf2.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'qpid/cpp/bindings/qmf2/python') diff --git a/qpid/cpp/bindings/qmf2/python/qmf2.py b/qpid/cpp/bindings/qmf2/python/qmf2.py index 9f2d8556f4..1d35b93601 100644 --- a/qpid/cpp/bindings/qmf2/python/qmf2.py +++ b/qpid/cpp/bindings/qmf2/python/qmf2.py @@ -18,7 +18,7 @@ # import cqmf2 -import cqpid +import qpid_messaging from threading import Thread import time @@ -124,7 +124,7 @@ class AgentHandler(Thread): def run(self): event = cqmf2.AgentEvent() while self.__running: - valid = self.__agent._impl.nextEvent(event, cqpid.Duration.SECOND) + valid = self.__agent._impl.nextEvent(event, qpid_messaging.Duration.SECOND) if valid and self.__running: if event.getType() == cqmf2.AGENT_METHOD: self.method(event, event.getMethodName(), event.getArguments(), event.getArgumentSubtypes(), @@ -156,7 +156,7 @@ class ConsoleHandler(Thread): def run(self): event = cqmf2.ConsoleEvent() while self.__running: - valid = self.__session._impl.nextEvent(event, cqpid.Duration.SECOND) + valid = self.__session._impl.nextEvent(event, qpid_messaging.Duration.SECOND) if valid and self.__running: if event.getType() == cqmf2.CONSOLE_AGENT_ADD: self.agentAdded(Agent(event.getAgent())) @@ -434,7 +434,7 @@ class Agent(object): q_arg = q._impl else: q_arg = q - dur = cqpid.Duration(cqpid.Duration.SECOND.getMilliseconds() * timeout) + dur = qpid_messaging.Duration(qpid_messaging.Duration.SECOND.getMilliseconds() * timeout) result = self._impl.query(q_arg, dur) if result.getType() == cqmf2.CONSOLE_EXCEPTION: raise Exception(Data(result.getData(0))) @@ -449,7 +449,7 @@ class Agent(object): def loadSchemaInfo(self, timeout=30): """ """ - dur = cqpid.Duration(cqpid.Duration.SECOND.getMilliseconds() * timeout) + dur = qpid_messaging.Duration(qpid_messaging.Duration.SECOND.getMilliseconds() * timeout) self._impl.querySchema(dur) def getPackages(self): @@ -473,7 +473,7 @@ class Agent(object): def getSchema(self, schemaId, timeout=30): """ """ - dur = cqpid.Duration(cqpid.Duration.SECOND.getMilliseconds() * timeout) + dur = qpid_messaging.Duration(qpid_messaging.Duration.SECOND.getMilliseconds() * timeout) return Schema(self._impl.getSchema(schemaId._impl, dur)) ## TODO: Async query @@ -555,7 +555,7 @@ class Data(object): return Agent(self._impl.getAgent()) def update(self, timeout=5): - dur = cqpid.Duration(cqpid.Duration.SECOND.getMilliseconds() * timeout) + dur = qpid_messaging.Duration(qpid_messaging.Duration.SECOND.getMilliseconds() * timeout) agent = self._impl.getAgent() query = cqmf2.Query(self._impl.getAddr()) result = agent.query(query, dur) @@ -590,7 +590,7 @@ class Data(object): timeout = 30 if '_timeout' in kwargs: timeout = kwargs['_timeout'] - dur = cqpid.Duration(cqpid.Duration.SECOND.getMilliseconds() * timeout) + dur = qpid_messaging.Duration(qpid_messaging.Duration.SECOND.getMilliseconds() * timeout) ## ## Get the list of arguments from the schema, isolate those that are IN or IN_OUT, -- cgit v1.2.1