From: Christian Berendt Date: Sun, 8 Jun 2014 16:30:43 +0000 (+0200) Subject: Use import from six.moves to import the queue module X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=a8d664d95f22a713d54c8ea30471dd3a4e976924;p=openstack-build%2Fneutron-build.git Use import from six.moves to import the queue module The name of the synchronized queue class is queue instead of Queue in Python3. Change-Id: I5c5aba89b30b311bbfba2b64c61ea566d339b7c9 Closes-Bug: #1327975 --- diff --git a/neutron/services/loadbalancer/drivers/radware/driver.py b/neutron/services/loadbalancer/drivers/radware/driver.py index 7f1942562..0cfb2a529 100644 --- a/neutron/services/loadbalancer/drivers/radware/driver.py +++ b/neutron/services/loadbalancer/drivers/radware/driver.py @@ -19,13 +19,13 @@ import base64 import copy import httplib -import Queue import threading import time import eventlet from oslo.config import cfg +from six.moves import queue as Queue from neutron.api.v2 import attributes from neutron.common import log as call_log diff --git a/neutron/tests/unit/services/loadbalancer/drivers/radware/test_plugin_driver.py b/neutron/tests/unit/services/loadbalancer/drivers/radware/test_plugin_driver.py index 25900e9a8..a073d30e0 100644 --- a/neutron/tests/unit/services/loadbalancer/drivers/radware/test_plugin_driver.py +++ b/neutron/tests/unit/services/loadbalancer/drivers/radware/test_plugin_driver.py @@ -16,11 +16,11 @@ # # @author: Avishay Balderman, Radware -import Queue import re import contextlib import mock +from six.moves import queue as Queue from neutron import context from neutron.extensions import loadbalancer