Merge "Use import from six.moves to import the queue module"

This commit is contained in:
Jenkins 2014-06-10 19:49:37 +00:00 committed by Gerrit Code Review
commit aeeab9f8b0
2 changed files with 2 additions and 2 deletions

View File

@ -19,7 +19,6 @@
import base64
import copy
import httplib
import Queue
import threading
import time
@ -28,6 +27,7 @@ import eventlet
eventlet.monkey_patch(thread=True)
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

View File

@ -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