Merge "termie all the things" into redux

15 files changed, 169 insertions, 169 deletions

diff --git a/keystone/cli.py b/keystone/cli.py
index 2caab52b..9616f955 100644
--- a/keystone/cli.py
+++ b/keystone/cli.py
@@ -317,7 +317,7 @@ class DictWrapper(dict):
 
 def print_commands(cmds):
     print
-    print "Available commands:"
+    print 'Available commands:'
     o = []
     max_length = max([len(k) for k in cmds]) + 2
     for k, cmd in sorted(cmds.iteritems()):
diff --git a/keystone/common/bufferedhttp.py b/keystone/common/bufferedhttp.py
index 769a9b8b..95caa4f4 100644
--- a/keystone/common/bufferedhttp.py
+++ b/keystone/common/bufferedhttp.py
@@ -95,8 +95,8 @@ class BufferedHTTPConnection(HTTPConnection):
 
     def getresponse(self):
         response = HTTPConnection.getresponse(self)
-        logging.debug(("HTTP PERF: %(time).5f seconds to %(method)s "
-                        "%(host)s:%(port)s %(path)s)"),
+        logging.debug(('HTTP PERF: %(time).5f seconds to %(method)s '
+                        '%(host)s:%(port)s %(path)s)'),
            {'time': time.time() - self._connected_time, 'method': self._method,
             'host': self.host, 'port': self.port, 'path': self._path})
         return response
diff --git a/keystone/common/cfg.py b/keystone/common/cfg.py
index 9551ff79..91c9546c 100644
--- a/keystone/common/cfg.py
+++ b/keystone/common/cfg.py
@@ -223,9 +223,9 @@ class ArgsAlreadyParsedError(Error):
     """Raised if a CLI opt is registered after parsing."""
 
     def __str__(self):
-        ret = "arguments already parsed"
+        ret = 'arguments already parsed'
         if self.msg:
-            ret += ": " + self.msg
+            ret += ': ' + self.msg
         return ret
 
 
@@ -238,9 +238,9 @@ class NoSuchOptError(Error):
 
     def __str__(self):
         if self.group is None:
-            return "no such option: %s" % self.opt_name
+            return 'no such option: %s' % self.opt_name
         else:
-            return "no such option in group %s: %s" % (self.group.name,
+            return 'no such option in group %s: %s' % (self.group.name,
                                                        self.opt_name)
 
 
@@ -251,7 +251,7 @@ class NoSuchGroupError(Error):
         self.group_name = group_name
 
     def __str__(self):
-        return "no such group: %s" % self.group_name
+        return 'no such group: %s' % self.group_name
 
 
 class DuplicateOptError(Error):
@@ -261,14 +261,14 @@ class DuplicateOptError(Error):
         self.opt_name = opt_name
 
     def __str__(self):
-        return "duplicate option: %s" % self.opt_name
+        return 'duplicate option: %s' % self.opt_name
 
 
 class TemplateSubstitutionError(Error):
     """Raised if an error occurs substituting a variable in an opt value."""
 
     def __str__(self):
-        return "template substitution error: %s" % self.msg
+        return 'template substitution error: %s' % self.msg
 
 
 class ConfigFilesNotFoundError(Error):
diff --git a/keystone/common/sql/core.py b/keystone/common/sql/core.py
index 172a2a66..2bd24f48 100644
--- a/keystone/common/sql/core.py
+++ b/keystone/common/sql/core.py
@@ -102,12 +102,12 @@ class Base(object):
         """Return a SQLAlchemy engine."""
         connection_dict = sqlalchemy.engine.url.make_url(CONF.sql.connection)
 
-        engine_args = {"pool_recycle": CONF.sql.idle_timeout,
-                       "echo": False,
+        engine_args = {'pool_recycle': CONF.sql.idle_timeout,
+                       'echo': False,
                        }
 
-        if "sqlite" in connection_dict.drivername:
-            engine_args["poolclass"] = sqlalchemy.pool.NullPool
+        if 'sqlite' in connection_dict.drivername:
+            engine_args['poolclass'] = sqlalchemy.pool.NullPool
 
         return sql.create_engine(CONF.sql.connection, **engine_args)
 
diff --git a/keystone/common/sql/migration.py b/keystone/common/sql/migration.py
index 11d459a1..0ea9cd12 100644
--- a/keystone/common/sql/migration.py
+++ b/keystone/common/sql/migration.py
@@ -36,7 +36,7 @@ except ImportError:
         # See LP Bug #717467
         from migrate import exceptions as versioning_exceptions
     except ImportError:
-        sys.exit("python-migrate is not installed. Exiting.")
+        sys.exit('python-migrate is not installed. Exiting.')
 
 
 def db_sync(version=None):
@@ -44,7 +44,7 @@ def db_sync(version=None):
         try:
             version = int(version)
         except ValueError:
-            raise Exception("version should be an integer")
+            raise Exception('version should be an integer')
 
     current_version = db_version()
     repo_path = _find_migrate_repo()
diff --git a/keystone/common/utils.py b/keystone/common/utils.py
index 6997eddd..f153c878 100644
--- a/keystone/common/utils.py
+++ b/keystone/common/utils.py
@@ -173,14 +173,14 @@ def check_output(*popenargs, **kwargs):
 
     The arguments are the same as for the Popen constructor.  Example:
 
-    >>> check_output(["ls", "-l", "/dev/null"])
+    >>> check_output(['ls', '-l', '/dev/null'])
     'crw-rw-rw- 1 root root 1, 3 Oct 18  2007 /dev/null\n'
 
     The stdout argument is not allowed as it is used internally.
     To capture standard error in the result, use stderr=STDOUT.
 
-    >>> check_output(["/bin/sh", "-c",
-    ...               "ls -l non_existent_file ; exit 0"],
+    >>> check_output(['/bin/sh', '-c',
+    ...               'ls -l non_existent_file ; exit 0'],
     ...              stderr=STDOUT)
     'ls: non_existent_file: No such file or directory\n'
     """
@@ -191,7 +191,7 @@ def check_output(*popenargs, **kwargs):
     output, unused_err = process.communicate()
     retcode = process.poll()
     if retcode:
-        cmd = kwargs.get("args")
+        cmd = kwargs.get('args')
         if cmd is None:
             cmd = popenargs[0]
         raise subprocess.CalledProcessError(retcode, cmd)
diff --git a/keystone/config.py b/keystone/config.py
index 09c18ca6..e95efe42 100644
--- a/keystone/config.py
+++ b/keystone/config.py
@@ -57,8 +57,8 @@ def setup_logging(conf):
             logging.config.fileConfig(conf.log_config)
             return
         else:
-            raise RuntimeError("Unable to locate specified logging "
-                               "config file: %s" % conf.log_config)
+            raise RuntimeError('Unable to locate specified logging '
+                               'config file: %s' % conf.log_config)
 
     root_logger = logging.root
     if conf.debug:
@@ -75,7 +75,7 @@ def setup_logging(conf):
             facility = getattr(logging.SysLogHandler,
                                conf.syslog_log_facility)
         except AttributeError:
-            raise ValueError(_("Invalid syslog facility"))
+            raise ValueError(_('Invalid syslog facility'))
 
         handler = logging.SysLogHandler(address='/dev/log',
                                         facility=facility)
diff --git a/keystone/contrib/admin_crud/core.py b/keystone/contrib/admin_crud/core.py
index ce0867e7..15a597ed 100644
--- a/keystone/contrib/admin_crud/core.py
+++ b/keystone/contrib/admin_crud/core.py
@@ -19,132 +19,132 @@ class CrudExtension(wsgi.ExtensionRouter):
         service_controller = catalog.ServiceController()
 
         # Tenant Operations
-        mapper.connect("/tenants", controller=tenant_controller,
-                    action="create_tenant",
-                    conditions=dict(method=["POST"]))
-        mapper.connect("/tenants/{tenant_id}",
+        mapper.connect('/tenants', controller=tenant_controller,
+                    action='create_tenant',
+                    conditions=dict(method=['POST']))
+        mapper.connect('/tenants/{tenant_id}',
                     controller=tenant_controller,
-                    action="update_tenant",
-                    conditions=dict(method=["PUT", "POST"]))
-        mapper.connect("/tenants/{tenant_id}",
+                    action='update_tenant',
+                    conditions=dict(method=['PUT', 'POST']))
+        mapper.connect('/tenants/{tenant_id}',
                     controller=tenant_controller,
-                    action="delete_tenant",
-                    conditions=dict(method=["DELETE"]))
-        mapper.connect("/tenants/{tenant_id}/users",
+                    action='delete_tenant',
+                    conditions=dict(method=['DELETE']))
+        mapper.connect('/tenants/{tenant_id}/users',
                     controller=user_controller,
-                    action="get_tenant_users",
-                    conditions=dict(method=["GET"]))
+                    action='get_tenant_users',
+                    conditions=dict(method=['GET']))
 
         # User Operations
-        mapper.connect("/users",
+        mapper.connect('/users',
                     controller=user_controller,
-                    action="get_users",
-                    conditions=dict(method=["GET"]))
-        mapper.connect("/users",
+                    action='get_users',
+                    conditions=dict(method=['GET']))
+        mapper.connect('/users',
                     controller=user_controller,
-                    action="create_user",
-                    conditions=dict(method=["POST"]))
+                    action='create_user',
+                    conditions=dict(method=['POST']))
         # NOTE(termie): not in diablo
-        mapper.connect("/users/{user_id}",
+        mapper.connect('/users/{user_id}',
                     controller=user_controller,
-                    action="update_user",
-                    conditions=dict(method=["PUT"]))
-        mapper.connect("/users/{user_id}",
+                    action='update_user',
+                    conditions=dict(method=['PUT']))
+        mapper.connect('/users/{user_id}',
                     controller=user_controller,
-                    action="delete_user",
-                    conditions=dict(method=["DELETE"]))
+                    action='delete_user',
+                    conditions=dict(method=['DELETE']))
 
         # COMPAT(diablo): the copy with no OS-KSADM is from diablo
-        mapper.connect("/users/{user_id}/password",
+        mapper.connect('/users/{user_id}/password',
                     controller=user_controller,
-                    action="set_user_password",
-                    conditions=dict(method=["PUT"]))
-        mapper.connect("/users/{user_id}/OS-KSADM/password",
+                    action='set_user_password',
+                    conditions=dict(method=['PUT']))
+        mapper.connect('/users/{user_id}/OS-KSADM/password',
                     controller=user_controller,
-                    action="set_user_password",
-                    conditions=dict(method=["PUT"]))
+                    action='set_user_password',
+                    conditions=dict(method=['PUT']))
 
         # COMPAT(diablo): the copy with no OS-KSADM is from diablo
-        mapper.connect("/users/{user_id}/tenant",
+        mapper.connect('/users/{user_id}/tenant',
                     controller=user_controller,
-                    action="update_user_tenant",
-                    conditions=dict(method=["PUT"]))
-        mapper.connect("/users/{user_id}/OS-KSADM/tenant",
+                    action='update_user_tenant',
+                    conditions=dict(method=['PUT']))
+        mapper.connect('/users/{user_id}/OS-KSADM/tenant',
                     controller=user_controller,
-                    action="update_user_tenant",
-                    conditions=dict(method=["PUT"]))
+                    action='update_user_tenant',
+                    conditions=dict(method=['PUT']))
 
         # COMPAT(diablo): the copy with no OS-KSADM is from diablo
-        mapper.connect("/users/{user_id}/enabled",
+        mapper.connect('/users/{user_id}/enabled',
                     controller=user_controller,
-                    action="set_user_enabled",
-                    conditions=dict(method=["PUT"]))
-        mapper.connect("/users/{user_id}/OS-KSADM/enabled",
+                    action='set_user_enabled',
+                    conditions=dict(method=['PUT']))
+        mapper.connect('/users/{user_id}/OS-KSADM/enabled',
                     controller=user_controller,
-                    action="set_user_enabled",
-                    conditions=dict(method=["PUT"]))
+                    action='set_user_enabled',
+                    conditions=dict(method=['PUT']))
 
         # User Roles
-        mapper.connect("/users/{user_id}/roles/OS-KSADM/{role_id}",
-            controller=role_controller, action="add_role_to_user",
-            conditions=dict(method=["PUT"]))
-        mapper.connect("/users/{user_id}/roles/OS-KSADM/{role_id}",
-            controller=role_controller, action="delete_role_from_user",
-            conditions=dict(method=["DELETE"]))
+        mapper.connect('/users/{user_id}/roles/OS-KSADM/{role_id}',
+            controller=role_controller, action='add_role_to_user',
+            conditions=dict(method=['PUT']))
+        mapper.connect('/users/{user_id}/roles/OS-KSADM/{role_id}',
+            controller=role_controller, action='delete_role_from_user',
+            conditions=dict(method=['DELETE']))
 
         # COMPAT(diablo): User Roles
-        mapper.connect("/users/{user_id}/roleRefs",
-            controller=role_controller, action="get_role_refs",
-            conditions=dict(method=["GET"]))
-        mapper.connect("/users/{user_id}/roleRefs",
-            controller=role_controller, action="create_role_ref",
-            conditions=dict(method=["POST"]))
-        mapper.connect("/users/{user_id}/roleRefs/{role_ref_id}",
-            controller=role_controller, action="delete_role_ref",
-            conditions=dict(method=["DELETE"]))
+        mapper.connect('/users/{user_id}/roleRefs',
+            controller=role_controller, action='get_role_refs',
+            conditions=dict(method=['GET']))
+        mapper.connect('/users/{user_id}/roleRefs',
+            controller=role_controller, action='create_role_ref',
+            conditions=dict(method=['POST']))
+        mapper.connect('/users/{user_id}/roleRefs/{role_ref_id}',
+            controller=role_controller, action='delete_role_ref',
+            conditions=dict(method=['DELETE']))
 
         # User-Tenant Roles
         mapper.connect(
-            "/tenants/{tenant_id}/users/{user_id}/roles/OS-KSADM/{role_id}",
-            controller=role_controller, action="add_role_to_user",
-            conditions=dict(method=["PUT"]))
+            '/tenants/{tenant_id}/users/{user_id}/roles/OS-KSADM/{role_id}',
+            controller=role_controller, action='add_role_to_user',
+            conditions=dict(method=['PUT']))
         mapper.connect(
-            "/tenants/{tenant_id}/users/{user_id}/roles/OS-KSADM/{role_id}",
-            controller=role_controller, action="remove_role_from_user",
-            conditions=dict(method=["DELETE"]))
+            '/tenants/{tenant_id}/users/{user_id}/roles/OS-KSADM/{role_id}',
+            controller=role_controller, action='remove_role_from_user',
+            conditions=dict(method=['DELETE']))
 
         # Service Operations
-        mapper.connect("/OS-KSADM/services",
+        mapper.connect('/OS-KSADM/services',
                        controller=service_controller,
-                       action="get_services",
-                       conditions=dict(method=["GET"]))
-        mapper.connect("/OS-KSADM/services",
+                       action='get_services',
+                       conditions=dict(method=['GET']))
+        mapper.connect('/OS-KSADM/services',
                        controller=service_controller,
-                       action="create_service",
-                       conditions=dict(method=["POST"]))
-        mapper.connect("/OS-KSADM/services/{service_id}",
+                       action='create_service',
+                       conditions=dict(method=['POST']))
+        mapper.connect('/OS-KSADM/services/{service_id}',
                        controller=service_controller,
-                       action="delete_service",
-                       conditions=dict(method=["DELETE"]))
-        mapper.connect("/OS-KSADM/services/{service_id}",
+                       action='delete_service',
+                       conditions=dict(method=['DELETE']))
+        mapper.connect('/OS-KSADM/services/{service_id}',
                        controller=service_controller,
-                       action="get_service",
-                       conditions=dict(method=["GET"]))
+                       action='get_service',
+                       conditions=dict(method=['GET']))
 
         # Role Operations
-        mapper.connect("/OS-KSADM/roles",
+        mapper.connect('/OS-KSADM/roles',
                        controller=role_controller,
-                       action="create_role",
-                       conditions=dict(method=["POST"]))
-        mapper.connect("/OS-KSADM/roles",
+                       action='create_role',
+                       conditions=dict(method=['POST']))
+        mapper.connect('/OS-KSADM/roles',
                        controller=role_controller,
-                       action="get_roles",
-                       conditions=dict(method=["GET"]))
-        mapper.connect("/OS-KSADM/roles/{role_id}",
+                       action='get_roles',
+                       conditions=dict(method=['GET']))
+        mapper.connect('/OS-KSADM/roles/{role_id}',
                        controller=role_controller,
-                       action="get_role",
-                       conditions=dict(method=["GET"]))
-        mapper.connect("/OS-KSADM/roles/{role_id}",
+                       action='get_role',
+                       conditions=dict(method=['GET']))
+        mapper.connect('/OS-KSADM/roles/{role_id}',
                        controller=role_controller,
-                       action="delete_role",
-                       conditions=dict(method=["DELETE"]))
+                       action='delete_role',
+                       conditions=dict(method=['DELETE']))
diff --git a/keystone/contrib/ec2/core.py b/keystone/contrib/ec2/core.py
index 90de2151..888b8ddd 100644
--- a/keystone/contrib/ec2/core.py
+++ b/keystone/contrib/ec2/core.py
@@ -95,15 +95,15 @@ class Ec2Controller(wsgi.Application):
         # NOTE(vish): Some libraries don't use the port when signing
         #             requests, so try again without port.
         elif ':' in credentials['signature']:
-            hostname, _port = credentials['host'].split(":")
+            hostname, _port = credentials['host'].split(':')
             credentials['host'] = hostname
             signature = signer.generate(credentials)
             if signature != credentials.signature:
                 # TODO(termie): proper exception
-                msg = "Invalid signature"
+                msg = 'Invalid signature'
                 raise webob.exc.HTTPUnauthorized(explanation=msg)
         else:
-            msg = "Signature not supplied"
+            msg = 'Signature not supplied'
             raise webob.exc.HTTPUnauthorized(explanation=msg)
 
     def authenticate(self, context, credentials=None,
@@ -137,7 +137,7 @@ class Ec2Controller(wsgi.Application):
         creds_ref = self.ec2_api.get_credential(context,
                                                 credentials['access'])
         if not creds_ref:
-            msg = "Access key not found"
+            msg = 'Access key not found'
             raise webob.exc.HTTPUnauthorized(explanation=msg)
 
         self.check_signature(creds_ref, credentials)
diff --git a/keystone/contrib/s3/core.py b/keystone/contrib/s3/core.py
index 208c6aa5..d69fade4 100644
--- a/keystone/contrib/s3/core.py
+++ b/keystone/contrib/s3/core.py
@@ -34,4 +34,4 @@ class S3Controller(ec2.Ec2Controller):
         signed = base64.encodestring(hmac.new(key, msg, sha1).digest()).strip()
 
         if credentials['signature'] != signed:
-            raise Exception("Not Authorized")
+            raise Exception('Not Authorized')
diff --git a/keystone/middleware/auth_token.py b/keystone/middleware/auth_token.py
index d806dd01..0dc723b9 100755
--- a/keystone/middleware/auth_token.py
+++ b/keystone/middleware/auth_token.py
@@ -78,7 +78,7 @@ from webob.exc import HTTPUnauthorized
 
 from keystone.common.bufferedhttp import http_connect_raw as http_connect
 
-PROTOCOL_NAME = "Token Authentication"
+PROTOCOL_NAME = 'Token Authentication'
 
 
 class AuthProtocol(object):
@@ -86,7 +86,7 @@ class AuthProtocol(object):
 
     def _init_protocol_common(self, app, conf):
         """ Common initialization code"""
-        print "Starting the %s component" % PROTOCOL_NAME
+        print 'Starting the %s component' % PROTOCOL_NAME
 
         self.conf = conf
         self.app = app
@@ -120,7 +120,7 @@ class AuthProtocol(object):
         # where to tell clients to find the auth service (default to url
         # constructed based on endpoint we have for the service to use)
         self.auth_location = conf.get('auth_uri',
-                                        "%s://%s:%s" % (self.auth_protocol,
+                                        '%s://%s:%s' % (self.auth_protocol,
                                         self.auth_host,
                                         self.auth_port))
 
@@ -152,8 +152,8 @@ class AuthProtocol(object):
             if self.delay_auth_decision:
                 #Configured to allow downstream service to make final decision.
                 #So mark status as Invalid and forward the request downstream
-                self._decorate_request("X_IDENTITY_STATUS",
-                    "Invalid", env, proxy_headers)
+                self._decorate_request('X_IDENTITY_STATUS',
+                    'Invalid', env, proxy_headers)
             else:
                 #Respond to client as appropriate for this auth protocol
                 return self._reject_request(env, start_response)
@@ -164,14 +164,14 @@ class AuthProtocol(object):
                 # Keystone rejected claim
                 if self.delay_auth_decision:
                     # Downstream service will receive call still and decide
-                    self._decorate_request("X_IDENTITY_STATUS",
-                        "Invalid", env, proxy_headers)
+                    self._decorate_request('X_IDENTITY_STATUS',
+                        'Invalid', env, proxy_headers)
                 else:
                     #Respond to client as appropriate for this auth protocol
                     return self._reject_claims(env, start_response)
             else:
-                self._decorate_request("X_IDENTITY_STATUS",
-                    "Confirmed", env, proxy_headers)
+                self._decorate_request('X_IDENTITY_STATUS',
+                    'Confirmed', env, proxy_headers)
 
             #Collect information about valid claims
             if valid:
@@ -179,7 +179,7 @@ class AuthProtocol(object):
 
                 # Store authentication data
                 if claims:
-                    self._decorate_request('X_AUTHORIZATION', "Proxy %s" %
+                    self._decorate_request('X_AUTHORIZATION', 'Proxy %s' %
                         claims['user'], env, proxy_headers)
 
                     # For legacy compatibility before we had ID and Name
@@ -218,14 +218,14 @@ class AuthProtocol(object):
         validate a user's token. Validate_token is a priviledged call so
         it needs to be authenticated by a service that is calling it
         """
-        headers = {"Content-type": "application/json",
-                   "Accept": "application/json"}
-        params = {"passwordCredentials": {"username": username,
-                                          "password": password,
-                                          "tenantId": "1"}}
-        conn = httplib.HTTPConnection("%s:%s" \
+        headers = {'Content-type': 'application/json',
+                   'Accept': 'application/json'}
+        params = {'passwordCredentials': {'username': username,
+                                          'password': password,
+                                          'tenantId': '1'}}
+        conn = httplib.HTTPConnection('%s:%s' \
             % (self.auth_host, self.auth_port))
-        conn.request("POST", "/v2.0/tokens", json.dumps(params), \
+        conn.request('POST', '/v2.0/tokens', json.dumps(params), \
             headers=headers)
         response = conn.getresponse()
         data = response.read()
@@ -238,8 +238,8 @@ class AuthProtocol(object):
 
     def _reject_request(self, env, start_response):
         """Redirect client to auth server"""
-        return webob.exc.HTTPUnauthorized("Authentication required",
-                    [("WWW-Authenticate",
+        return webob.exc.HTTPUnauthorized('Authentication required',
+                    [('WWW-Authenticate',
                       "Keystone uri='%s'" % self.auth_location)])(env,
                                                         start_response)
 
@@ -255,19 +255,19 @@ class AuthProtocol(object):
         # admin token
         #TODO(ziad): Need to properly implement this, where to store creds
         # for now using token from ini
-        #auth = self.get_admin_auth_token("admin", "secrete", "1")
-        #admin_token = json.loads(auth)["auth"]["token"]["id"]
+        #auth = self.get_admin_auth_token('admin', 'secrete', '1')
+        #admin_token = json.loads(auth)['auth']['token']['id']
 
         # Step 2: validate the user's token with the auth service
         # since this is a priviledged op,m we need to auth ourselves
         # by using an admin token
-        headers = {"Content-type": "application/json",
-                    "Accept": "application/json",
-                    "X-Auth-Token": self.admin_token}
+        headers = {'Content-type': 'application/json',
+                    'Accept': 'application/json',
+                    'X-Auth-Token': self.admin_token}
                     ##TODO(ziad):we need to figure out how to auth to keystone
                     #since validate_token is a priviledged call
                     #Khaled's version uses creds to get a token
-                    # "X-Auth-Token": admin_token}
+                    # 'X-Auth-Token': admin_token}
                     # we're using a test token from the ini file for now
         conn = http_connect(self.auth_host, self.auth_port, 'GET',
                             '/v2.0/tokens/%s' % claims, headers=headers)
@@ -287,13 +287,13 @@ class AuthProtocol(object):
     def _expound_claims(self, claims):
         # Valid token. Get user data and put it in to the call
         # so the downstream service can use it
-        headers = {"Content-type": "application/json",
-                    "Accept": "application/json",
-                    "X-Auth-Token": self.admin_token}
+        headers = {'Content-type': 'application/json',
+                    'Accept': 'application/json',
+                    'X-Auth-Token': self.admin_token}
                     ##TODO(ziad):we need to figure out how to auth to keystone
                     #since validate_token is a priviledged call
                     #Khaled's version uses creds to get a token
-                    # "X-Auth-Token": admin_token}
+                    # 'X-Auth-Token': admin_token}
                     # we're using a test token from the ini file for now
         conn = http_connect(self.auth_host, self.auth_port, 'GET',
                             '/v2.0/tokens/%s' % claims, headers=headers)
@@ -306,12 +306,12 @@ class AuthProtocol(object):
 
         token_info = json.loads(data)
         roles = []
-        role_refs = token_info["access"]["user"]["roles"]
+        role_refs = token_info['access']['user']['roles']
         if role_refs != None:
             for role_ref in role_refs:
                 # Nova looks for the non case-sensitive role 'Admin'
                 # to determine admin-ness
-                roles.append(role_ref["name"])
+                roles.append(role_ref['name'])
 
         try:
             tenant = token_info['access']['token']['tenant']['id']
@@ -332,12 +332,12 @@ class AuthProtocol(object):
     def _decorate_request(self, index, value, env, proxy_headers):
         """Add headers to request"""
         proxy_headers[index] = value
-        env["HTTP_%s" % index] = value
+        env['HTTP_%s' % index] = value
 
     def _forward_request(self, env, start_response, proxy_headers):
         """Token/Auth processed & claims added to headers"""
         self._decorate_request('AUTHORIZATION',
-            "Basic %s" % self.service_pass, env, proxy_headers)
+            'Basic %s' % self.service_pass, env, proxy_headers)
         #now decide how to pass on the call
         if self.app:
             # Pass to downstream WSGI component
@@ -362,7 +362,7 @@ class AuthProtocol(object):
 
             if resp.status == 401 or resp.status == 305:
                 # Add our own headers to the list
-                headers = [("WWW_AUTHENTICATE",
+                headers = [('WWW_AUTHENTICATE',
                    "Keystone uri='%s'" % self.auth_location)]
                 return webob.Response(status=resp.status,
                                       body=data,
@@ -387,11 +387,11 @@ def app_factory(global_conf, **local_conf):
     conf.update(local_conf)
     return AuthProtocol(None, conf)
 
-if __name__ == "__main__":
-    app = deploy.loadapp("config:" + \
+if __name__ == '__main__':
+    app = deploy.loadapp('config:' + \
         os.path.join(os.path.abspath(os.path.dirname(__file__)),
                      os.pardir,
                      os.pardir,
-                    "examples/paste/auth_token.ini"),
-                    global_conf={"log_name": "auth_token.log"})
+                    'examples/paste/auth_token.ini'),
+                    global_conf={'log_name': 'auth_token.log'})
     wsgi.server(eventlet.listen(('', 8090)), app)
diff --git a/keystone/middleware/core.py b/keystone/middleware/core.py
index 46d38673..8e206dde 100644
--- a/keystone/middleware/core.py
+++ b/keystone/middleware/core.py
@@ -115,15 +115,15 @@ class Debug(wsgi.Middleware):
 
     @webob.dec.wsgify
     def __call__(self, req):
-        print ("*" * 40) + " REQUEST ENVIRON"
+        print ('*' * 40) + ' REQUEST ENVIRON'
         for key, value in req.environ.items():
-            print key, "=", value
+            print key, '=', value
         print
         resp = req.get_response(self.application)
 
-        print ("*" * 40) + " RESPONSE HEADERS"
+        print ('*' * 40) + ' RESPONSE HEADERS'
         for (key, value) in resp.headers.iteritems():
-            print key, "=", value
+            print key, '=', value
         print
 
         resp.app_iter = self.print_generator(resp.app_iter)
@@ -136,7 +136,7 @@ class Debug(wsgi.Middleware):
         Iterator that prints the contents of a wrapper string iterator
         when iterated.
         """
-        print ("*" * 40) + " BODY"
+        print ('*' * 40) + ' BODY'
         for part in app_iter:
             sys.stdout.write(part)
             sys.stdout.flush()
diff --git a/keystone/middleware/ec2_token.py b/keystone/middleware/ec2_token.py
index af141627..cc3094a3 100644
--- a/keystone/middleware/ec2_token.py
+++ b/keystone/middleware/ec2_token.py
@@ -65,11 +65,11 @@ class EC2Token(wsgi.Middleware):
         creds_json = utils.dumps(creds)
         headers = {'Content-Type': 'application/json'}
 
-        # Disable "has no x member" pylint error
+        # Disable 'has no x member' pylint error
         # for httplib and urlparse
         # pylint: disable-msg=E1101
         o = urlparse(FLAGS.keystone_ec2_url)
-        if o.scheme == "http":
+        if o.scheme == 'http':
             conn = httplib.HTTPConnection(o.netloc)
         else:
             conn = httplib.HTTPSConnection(o.netloc)
diff --git a/keystone/middleware/swift_auth.py b/keystone/middleware/swift_auth.py
index 35bab6a3..e83c1366 100755
--- a/keystone/middleware/swift_auth.py
+++ b/keystone/middleware/swift_auth.py
@@ -49,7 +49,7 @@ from swift.common.middleware.acl import clean_acl, parse_acl, referrer_allowed
 from swift.common.utils import get_logger, split_path
 
 
-PROTOCOL_NAME = "Swift Token Authentication"
+PROTOCOL_NAME = 'Swift Token Authentication'
 
 
 class AuthProtocol(object):
@@ -195,9 +195,9 @@ class AuthProtocol(object):
         # TODO(todd): cache
 
         self.log.debug('Asking keystone to validate token')
-        headers = {"Content-type": "application/json",
-                    "Accept": "application/json",
-                    "X-Auth-Token": self.admin_token}
+        headers = {'Content-type': 'application/json',
+                    'Accept': 'application/json',
+                    'X-Auth-Token': self.admin_token}
         self.log.debug('headers: %r', headers)
         self.log.debug('url: %s', self.keystone_url)
         conn = http_connect(self.keystone_url.hostname, self.keystone_url.port,
@@ -206,17 +206,17 @@ class AuthProtocol(object):
         data = resp.read()
         conn.close()
 
-        # Check http status code for the "OK" family of responses
+        # Check http status code for the 'OK' family of responses
         if not str(resp.status).startswith('20'):
             return False
 
         identity_info = json.loads(data)
         roles = []
-        role_refs = identity_info["access"]["user"]["roles"]
+        role_refs = identity_info['access']['user']['roles']
 
         if role_refs is not None:
             for role_ref in role_refs:
-                roles.append(role_ref["id"])
+                roles.append(role_ref['id'])
 
         try:
             tenant = identity_info['access']['token']['tenantId']
diff --git a/keystone/test.py b/keystone/test.py
index 1eeff449..f28ce6f7 100644
--- a/keystone/test.py
+++ b/keystone/test.py
@@ -227,12 +227,12 @@ class TestCase(unittest.TestCase):
     def assertDictEquals(self, actual, expected):
         for k in expected:
             self.assertTrue(k in actual,
-                            "Expected key %s not in %s." % (k, actual))
+                            'Expected key %s not in %s.' % (k, actual))
             self.assertDeepEquals(expected[k], actual[k])
 
         for k in actual:
             self.assertTrue(k in expected,
-                            "Unexpected key %s in %s." % (k, actual))
+                            'Unexpected key %s in %s.' % (k, actual))
 
     def assertDeepEquals(self, actual, expected):
         try: