From: Zhongyue Luo Date: Mon, 21 Jan 2013 00:50:58 +0000 (+0800) Subject: Fixes import order errors X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=5db8a2235251a18f4fdeff31d30d3b95c4e1cb36;p=openstack-build%2Fneutron-build.git Fixes import order errors Change-Id: I3df7bfb2e0812b006fa41bd76fb6156ebcd74362 --- diff --git a/quantum/common/exceptions.py b/quantum/common/exceptions.py index 2892c4518..cc91eeca5 100644 --- a/quantum/common/exceptions.py +++ b/quantum/common/exceptions.py @@ -20,8 +20,8 @@ Quantum base exception handling. """ from quantum.openstack.common.exception import Error -from quantum.openstack.common.exception import OpenstackException from quantum.openstack.common.exception import InvalidContentType +from quantum.openstack.common.exception import OpenstackException class QuantumException(OpenstackException): diff --git a/quantum/db/portsecurity_db.py b/quantum/db/portsecurity_db.py index c40999064..e4f2f44d9 100644 --- a/quantum/db/portsecurity_db.py +++ b/quantum/db/portsecurity_db.py @@ -16,8 +16,8 @@ # # @author: Aaron Rosen, Nicira, Inc -from sqlalchemy.orm import exc import sqlalchemy as sa +from sqlalchemy.orm import exc from quantum.db import model_base from quantum.extensions import portsecurity as psec diff --git a/quantum/plugins/nec/nec_plugin.py b/quantum/plugins/nec/nec_plugin.py index b4f94443c..552f8ce05 100644 --- a/quantum/plugins/nec/nec_plugin.py +++ b/quantum/plugins/nec/nec_plugin.py @@ -21,9 +21,9 @@ from quantum import context from quantum.db import dhcp_rpc_base from quantum.db import l3_db from quantum.db import l3_rpc_base -from quantum.extensions import portbindings #NOTE(amotoki): quota_db cannot be removed, it is for db model from quantum.db import quota_db +from quantum.extensions import portbindings from quantum.openstack.common import log as logging from quantum.openstack.common import rpc from quantum.plugins.nec.common import config diff --git a/quantum/tests/unit/nec/test_nec_plugin.py b/quantum/tests/unit/nec/test_nec_plugin.py index 54412ac59..9a06f96d7 100644 --- a/quantum/tests/unit/nec/test_nec_plugin.py +++ b/quantum/tests/unit/nec/test_nec_plugin.py @@ -14,8 +14,8 @@ # limitations under the License. from quantum.extensions import portbindings -from quantum.tests.unit import test_db_plugin as test_plugin from quantum.tests.unit import _test_extension_portbindings as test_bindings +from quantum.tests.unit import test_db_plugin as test_plugin class NecPluginV2TestCase(test_plugin.QuantumDbPluginV2TestCase): diff --git a/quantum/tests/unit/test_l3_plugin.py b/quantum/tests/unit/test_l3_plugin.py index ce954e2d5..01a0a7e7b 100644 --- a/quantum/tests/unit/test_l3_plugin.py +++ b/quantum/tests/unit/test_l3_plugin.py @@ -42,8 +42,8 @@ from quantum.extensions import l3 from quantum import manager from quantum.openstack.common import cfg from quantum.openstack.common import log as logging -from quantum.openstack.common.notifier import test_notifier from quantum.openstack.common.notifier import api as notifier_api +from quantum.openstack.common.notifier import test_notifier from quantum.openstack.common import uuidutils from quantum.tests.unit import test_api_v2 from quantum.tests.unit import test_db_plugin diff --git a/quantum/tests/unit/test_wsgi.py b/quantum/tests/unit/test_wsgi.py index 049b54f28..d455fe41b 100644 --- a/quantum/tests/unit/test_wsgi.py +++ b/quantum/tests/unit/test_wsgi.py @@ -20,8 +20,8 @@ import socket import unittest2 as unittest -from quantum import wsgi from quantum.common import exceptions as exception +from quantum import wsgi class TestWSGIServer(unittest.TestCase):