Vinkesh | Changed import orders according to pep8 recommendations

diff --git a/quantum/common/extensions.py b/quantum/common/extensions.py
index 430c0c94de717eb33aec41661060942a8e28d511..10795f80536e30e559738240d633413b8972a498 100644 (file)
--- a/quantum/common/extensions.py
+++ b/quantum/common/extensions.py
@@ -16,18 +16,17 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
-
 import imp
+import logging
 import os
 import routes
-import logging
 import webob.dec
 import webob.exc
+
 from gettext import gettext as _
 from abc import ABCMeta
-
-from quantum.manager import QuantumManager
 from quantum.common import exceptions
+from quantum.manager import QuantumManager
 from quantum.common import wsgi
 
 LOG = logging.getLogger('quantum.common.extensions')

diff --git a/quantum/common/flags.py b/quantum/common/flags.py
index 5adf4c3854a7f4558d3959c71c03697f0f7866c4..16badd33293390ef68f9bd5567326c0bd1f5d0c7 100644 (file)
--- a/quantum/common/flags.py
+++ b/quantum/common/flags.py
@@ -21,14 +21,12 @@ Wraps gflags.
 Global flags should be defined here, the rest are defined where they're used.
 
 """
-
 import getopt
+import gflags
 import os
 import string
 import sys
 
-import gflags
-
 
 class FlagValues(gflags.FlagValues):
     """Extension of gflags.FlagValues that allows undefined and runtime flags.

diff --git a/quantum/common/utils.py b/quantum/common/utils.py
index ea6241e21b5d1fcbc3bcb3ec6d54a34c83c2de57..5662e7465a35c181bfa6a92814bc9065642afc27 100644 (file)
--- a/quantum/common/utils.py
+++ b/quantum/common/utils.py
@@ -18,8 +18,10 @@
 """
 System-level utilities and helper functions.
 """
-
+import ConfigParser
 import datetime
+import exceptions as exception
+import flags
 import inspect
 import logging
 import os
@@ -27,10 +29,8 @@ import random
 import subprocess
 import socket
 import sys
-import ConfigParser
 
-import exceptions as exception
-import flags
+
 from exceptions import ProcessExecutionError
 
 

diff --git a/quantum/common/wsgi.py b/quantum/common/wsgi.py
index ca9734e878e8f4d4cce85065429bd2c3a7c67b09..94df7913c63e20ab1feae6b7ed16aa896ad31bf1 100644 (file)
--- a/quantum/common/wsgi.py
+++ b/quantum/common/wsgi.py
@@ -22,17 +22,17 @@ Utility methods for working with WSGI servers
 
 import logging
 import sys
-
-from xml.dom import minidom
-
 import eventlet.wsgi
 eventlet.patcher.monkey_patch(all=False, socket=True)
 import routes.middleware
 import webob.dec
 import webob.exc
+from xml.dom import minidom
+
 
-from quantum import utils
 from quantum.common import exceptions as exception
+from quantum import utils
+
 
 LOG = logging.getLogger('quantum.common.wsgi')
 

diff --git a/quantum/db/api.py b/quantum/db/api.py
index 6813d2096ce114c7c22f577ecb44d26f4052cd42..2b7167ba8d40bebe1896bc0ca1ccab3efd14984f 100644 (file)
--- a/quantum/db/api.py
+++ b/quantum/db/api.py
@@ -20,8 +20,10 @@
 from sqlalchemy import create_engine
 from sqlalchemy.orm import sessionmaker, exc
 
+
 from quantum.db import models
 
+
 _ENGINE = None
 _MAKER = None
 BASE = models.BASE

diff --git a/quantum/db/models.py b/quantum/db/models.py
index 1a18e7e5188e81b251b3ef1a650e45922236e59c..240b28349efc92a3b3764696c20561f5d433fdbc 100644 (file)
--- a/quantum/db/models.py
+++ b/quantum/db/models.py
@@ -19,10 +19,12 @@
 
 import uuid
 
+
 from sqlalchemy import Column, String, ForeignKey
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.orm import relation, object_mapper
 
+
 BASE = declarative_base()
 
 

diff --git a/tests/unit/test_api.py b/tests/unit/test_api.py
index d17e6ed87fad0c4add107a6b1c6adc959644e2a7..4eca189cfcf9a948bc0c5bb909fd6fa6496e0347 100644 (file)
--- a/tests/unit/test_api.py
+++ b/tests/unit/test_api.py
@@ -20,8 +20,8 @@
 import logging
 import unittest
 
-import tests.unit.testlib_api as testlib
 
+import tests.unit.testlib_api as testlib
 from quantum import api as server
 from quantum.db import api as db
 from quantum.common.wsgi import Serializer

diff --git a/tests/unit/test_extensions.py b/tests/unit/test_extensions.py
index 22079df6779dd24d0767fddce5a2df6df931479d..b22a8a3c55fbee26c81f38e26c26ab435080aebd 100644 (file)
--- a/tests/unit/test_extensions.py
+++ b/tests/unit/test_extensions.py
@@ -14,12 +14,13 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 import json
-import unittest
-import routes
 import os.path
+import routes
+import unittest
 from tests.unit import BaseTest
-
 from webtest import TestApp
+
+
 from quantum.common import wsgi
 from quantum.common import config
 from quantum.common import extensions
@@ -32,6 +33,7 @@ from quantum.common.extensions import (ExtensionManager,
                                        PluginAwareExtensionManager,
                                        ExtensionMiddleware)
 
+
 test_conf_file = os.path.join(os.path.dirname(__file__), os.pardir,
                               os.pardir, 'etc', 'quantum.conf.test')
 extensions_path = os.path.join(os.path.dirname(__file__), "extensions")