Merge "Use import from six.moves to import the queue module"
This commit is contained in:
commit
aeeab9f8b0
@ -19,7 +19,6 @@
|
|||||||
import base64
|
import base64
|
||||||
import copy
|
import copy
|
||||||
import httplib
|
import httplib
|
||||||
import Queue
|
|
||||||
import threading
|
import threading
|
||||||
import time
|
import time
|
||||||
|
|
||||||
@ -28,6 +27,7 @@ import eventlet
|
|||||||
eventlet.monkey_patch(thread=True)
|
eventlet.monkey_patch(thread=True)
|
||||||
|
|
||||||
from oslo.config import cfg
|
from oslo.config import cfg
|
||||||
|
from six.moves import queue as Queue
|
||||||
|
|
||||||
from neutron.api.v2 import attributes
|
from neutron.api.v2 import attributes
|
||||||
from neutron.common import log as call_log
|
from neutron.common import log as call_log
|
||||||
|
@ -16,11 +16,11 @@
|
|||||||
#
|
#
|
||||||
# @author: Avishay Balderman, Radware
|
# @author: Avishay Balderman, Radware
|
||||||
|
|
||||||
import Queue
|
|
||||||
import re
|
import re
|
||||||
|
|
||||||
import contextlib
|
import contextlib
|
||||||
import mock
|
import mock
|
||||||
|
from six.moves import queue as Queue
|
||||||
|
|
||||||
from neutron import context
|
from neutron import context
|
||||||
from neutron.extensions import loadbalancer
|
from neutron.extensions import loadbalancer
|
||||||
|
Loading…
Reference in New Issue
Block a user