From 39e3a2c66c7a4394ee3fbc92716126ca1af099e6 Mon Sep 17 00:00:00 2001 From: Flavio Percoco Date: Thu, 11 Sep 2014 16:49:37 +0200 Subject: [PATCH] Don't import client from the version package zaqar client has a client discovery function that should be used instead of the client module in the version package. This patch fixes that issue in our benchmark tool by importing the right client module. Change-Id: I294e56cedd8fd0a9ec7f4cc01d8396fd3edb2335 --- zaqar/bench/conductor.py | 2 +- zaqar/bench/consumer.py | 2 +- zaqar/bench/observer.py | 2 +- zaqar/bench/producer.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/zaqar/bench/conductor.py b/zaqar/bench/conductor.py index ba92fcd6a..a6f03e3e4 100644 --- a/zaqar/bench/conductor.py +++ b/zaqar/bench/conductor.py @@ -17,7 +17,7 @@ from __future__ import print_function import json import multiprocessing as mp -from zaqarclient.queues.v1 import client +from zaqarclient.queues import client from zaqar.bench import config from zaqar.bench import consumer diff --git a/zaqar/bench/consumer.py b/zaqar/bench/consumer.py index 9588025e5..6e0162af3 100644 --- a/zaqar/bench/consumer.py +++ b/zaqar/bench/consumer.py @@ -24,7 +24,7 @@ from gevent import monkey as curious_george curious_george.patch_all(thread=False, select=False) import gevent import marktime -from zaqarclient.queues.v1 import client +from zaqarclient.queues import client from zaqarclient.transport import errors from zaqar.bench import config diff --git a/zaqar/bench/observer.py b/zaqar/bench/observer.py index 005dbeb17..f4b5ef054 100644 --- a/zaqar/bench/observer.py +++ b/zaqar/bench/observer.py @@ -25,7 +25,7 @@ curious_george.patch_all(thread=False, select=False) import gevent import marktime from six.moves import urllib -from zaqarclient.queues.v1 import client +from zaqarclient.queues import client from zaqarclient.transport import errors from zaqar.bench import config diff --git a/zaqar/bench/producer.py b/zaqar/bench/producer.py index bcbf4e9dc..9c12e9bd3 100644 --- a/zaqar/bench/producer.py +++ b/zaqar/bench/producer.py @@ -25,7 +25,7 @@ from gevent import monkey as curious_george curious_george.patch_all(thread=False, select=False) import gevent import marktime -from zaqarclient.queues.v1 import client +from zaqarclient.queues import client from zaqarclient.transport import errors from zaqar.bench import config