Fixed imports in keystone.common

4 files changed, 7 insertions, 16 deletions

diff --git a/keystone/common/config.py b/keystone/common/config.py
index 34281192..71925239 100755
--- a/keystone/common/config.py
+++ b/keystone/common/config.py
@@ -20,18 +20,12 @@
 Routines for configuring OpenStack Service
 """
 
-import ConfigParser
-import logging
 import logging.config
-import logging.handlers
 import optparse
 import os
 from paste import deploy
-import re
 import sys
 
-import keystone.common.exception as exception
-
 DEFAULT_LOG_FORMAT = "%(asctime)s %(levelname)8s [%(name)s] %(message)s"
 DEFAULT_LOG_DATE_FORMAT = "%Y-%m-%d %H:%M:%S"
 
diff --git a/keystone/common/exception.py b/keystone/common/exception.py
index fb64220d..ee4f4392 100755
--- a/keystone/common/exception.py
+++ b/keystone/common/exception.py
@@ -22,8 +22,6 @@ OpenStack-type exceptions. SHOULD include dedicated exception logging.
 """
 
 import logging
-import sys
-import traceback
 
 
 class ProcessExecutionError(IOError):
diff --git a/keystone/common/template.py b/keystone/common/template.py
index f8412d62..23910d85 100644
--- a/keystone/common/template.py
+++ b/keystone/common/template.py
@@ -45,6 +45,7 @@ import re
 import os
 import functools
 import time
+import tokenize
 from webob import Response
 
 import keystone.logic.types.fault as fault
@@ -124,7 +125,7 @@ class BaseTemplate(object):
 
 
 class SimpleTemplate(BaseTemplate):
-    blocks = ('if','elif','else','try','except','finally','for','while','with','def','class')
+    blocks = ('if', 'elif', 'else', 'try', 'except', 'finally', 'for', 'while', 'with', 'def', 'class')
     dedent_blocks = ('elif', 'else', 'except', 'finally')
 
     def prepare(self, escape_func=cgi.escape, noescape=False):
@@ -163,7 +164,7 @@ class SimpleTemplate(BaseTemplate):
             try:
                 tokens = list(tokenize.generate_tokens(iter(line).next))
             except tokenize.TokenError:
-                return line.rsplit('#',1) if '#' in line else (line, '')
+                return line.rsplit('#', 1) if '#' in line else (line, '')
             for token in tokens:
                 if token[0] == tokenize.COMMENT:
                     start, end = token[2][1], token[3][1]
@@ -181,7 +182,7 @@ class SimpleTemplate(BaseTemplate):
                         cline += '_str(%s)' % value
                     elif token == 'CMD':
                         cline += '_escape(%s)' % value
-                    cline +=  ', '
+                    cline += ', '
                 cline = cline[:-2] + '\\\n'
             cline = cline[:-2]
             if cline[:-1].endswith('\\\\\\\\\\n'):
@@ -201,9 +202,9 @@ class SimpleTemplate(BaseTemplate):
             if lineno <= 2:
                 m = re.search(r"%.*coding[:=]\s*([-\w\.]+)", line)
                 if m: self.encoding = m.group(1)
-                if m: line = line.replace('coding','coding (removed)')
+                if m: line = line.replace('coding', 'coding (removed)')
             if line.strip()[:2].count('%') == 1:
-                line = line.split('%',1)[1].lstrip() # Full line following the %
+                line = line.split('%', 1)[1].lstrip() # Full line following the %
                 cline = split_comment(line)[0].strip()
                 cmd = re.split(r'[^a-zA-Z0-9_]', cline)[0]
                 flush() ##encodig (TODO: why?)
@@ -319,7 +320,7 @@ def template(tpl, template_adapter=SimpleTemplate, **kwargs):
     You can use a name, a filename or a template string as first parameter.
     '''
     if tpl not in TEMPLATES or DEBUG:
-        settings = kwargs.get('template_settings',{})
+        settings = kwargs.get('template_settings', {})
         lookup = kwargs.get('template_lookup', TEMPLATE_PATH)
         if isinstance(tpl, template_adapter):
             TEMPLATES[tpl] = tpl
diff --git a/keystone/common/wsgi.py b/keystone/common/wsgi.py
index 1f48137c..b89732f9 100755
--- a/keystone/common/wsgi.py
+++ b/keystone/common/wsgi.py
@@ -26,10 +26,8 @@ import logging
 import sys
 import datetime
 
-import eventlet
 import eventlet.wsgi
 eventlet.patcher.monkey_patch(all=False, socket=True)
-import routes
 import routes.middleware
 import webob.dec
 import webob.exc