From: Brad Hall <bhall@nicira.com>
Date: Fri, 20 May 2011 23:22:48 +0000 (-0700)
Subject: Minor fixes: indentation in bin/quantum and fix import in config.py
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=b6f2ca5aa0e774826dc5855f98fb446ee78a2430;p=openstack-build%2Fneutron-build.git

Minor fixes: indentation in bin/quantum and fix import in config.py
---

diff --git a/bin/quantum b/bin/quantum
index 16ef7346d..d19fa91ef 100644
--- a/bin/quantum
+++ b/bin/quantum
@@ -37,9 +37,9 @@ from quantum.common import wsgi
 from quantum.common import config
 
 def create_options(parser):
-    """                             
+    """
     Sets up the CLI and config-file options that may be
-    parsed and program commands.                                                        
+    parsed and program commands.
     :param parser: The option parser
     """
     config.add_common_options(parser)
@@ -53,10 +53,9 @@ if __name__ == '__main__':
 
     try:
         conf, app = config.load_paste_app('quantum', options, args)
-        
-    server = wsgi.Server()
-    server.start(app, int(conf['bind_port']), conf['bind_host'])
-    server.wait()
+        server = wsgi.Server()
+        server.start(app, int(conf['bind_port']), conf['bind_host'])
+        server.wait()
     except RuntimeError, e:
-    sys.exit("ERROR: %s" % e)
+        sys.exit("ERROR: %s" % e)
 
diff --git a/quantum/common/config.py b/quantum/common/config.py
index dbbcd260f..21c1b5951 100644
--- a/quantum/common/config.py
+++ b/quantum/common/config.py
@@ -31,7 +31,7 @@ import sys
 
 from paste import deploy
 
-import quantum.common.exception as exception
+import quantum.common.exceptions as exception
 
 DEFAULT_LOG_FORMAT = "%(asctime)s %(levelname)8s [%(name)s] %(message)s"
 DEFAULT_LOG_DATE_FORMAT = "%Y-%m-%d %H:%M:%S"