Pep8 formatting

hooks/keystone_hooks.py

@@ -22,7 +22,6 @@ from charmhelpers.core.hookenv import (
 from charmhelpers.core.host import (
     mkdir,
     restart_on_change,
-    service_restart,
 )
 
 from charmhelpers.fetch import (
@@ -77,7 +76,7 @@ def config_changed():
     unison.ensure_user(user=SSH_USER, group='keystone')
     homedir = unison.get_homedir(SSH_USER)
     if not os.path.isdir(homedir):
-        mkdir(homedir, SSH_USER, 'keystone', 0775)
+        mkdir(homedir, SSH_USER, 'keystone', 0o775)
 
     if openstack_upgrade_available('keystone'):
         do_openstack_upgrade(configs=CONFIGS)

hooks/keystone_ssl.py

@@ -113,7 +113,7 @@ def init_ca(ca_dir, common_name, org_name=ORG_NAME, org_unit_name=ORG_UNIT):
         if not os.path.exists(d):
             print 'Creating %s.' % d
             os.mkdir(d)
-    os.chmod(os.path.join(ca_dir, 'private'), 0710)
+    os.chmod(os.path.join(ca_dir, 'private'), 0o710)
 
     if not os.path.isfile(os.path.join(ca_dir, 'serial')):
         with open(os.path.join(ca_dir, 'serial'), 'wb') as out:
@@ -238,6 +238,7 @@ def tar_directory(path):
 
 
 class JujuCA(object):
+
     def __init__(self, name, ca_dir, root_ca_dir, user, group):
         root_crt, root_key = init_root_ca(root_ca_dir,
                                           '%s Certificate Authority' % name)

hooks/keystone_utils.py

@@ -252,7 +252,7 @@ def migrate_database():
     time.sleep(10)
 
 
-## OLD
+# OLD
 
 def get_local_endpoint():
     """ Returns the URL for the local end-point bypassing haproxy/ssl """
@@ -415,7 +415,7 @@ def grant_role(user, role, tenant):
     import manager
     manager = manager.KeystoneManager(endpoint=get_local_endpoint(),
                                       token=get_admin_token())
-    log("Granting user '%s' role '%s' on tenant '%s'" % \
+    log("Granting user '%s' role '%s' on tenant '%s'" %
        (user, role, tenant))
     user_id = manager.resolve_user_id(user)
     role_id = manager.resolve_role_id(role)
@@ -426,10 +426,10 @@ def grant_role(user, role, tenant):
         manager.api.roles.add_user_role(user=user_id,
                                         role=role_id,
                                         tenant=tenant_id)
-        log("Granted user '%s' role '%s' on tenant '%s'" % \
+        log("Granted user '%s' role '%s' on tenant '%s'" %
            (user, role, tenant))
     else:
-        log("User '%s' already has role '%s' on tenant '%s'" % \
+        log("User '%s' already has role '%s' on tenant '%s'" %
            (user, role, tenant))
 
 
@@ -453,7 +453,7 @@ def ensure_initial_admin(config):
         log("Loading stored passwd from %s" % STORED_PASSWD)
         passwd = open(STORED_PASSWD, 'r').readline().strip('\n')
     if passwd == "":
-        log("Generating new passwd for user: %s" % \
+        log("Generating new passwd for user: %s" %
             config("admin-user"))
         cmd = ['pwgen', '-c', '16', '1']
         passwd = str(subprocess.check_output(cmd)).strip()
@@ -506,7 +506,7 @@ def update_user_password(username, password):
         error_out("Could not resolve user id for '%s'" % username)
 
     manager.api.users.update_password(user=user_id, password=password)
-    log("Successfully updated password for user '%s'" % \
+    log("Successfully updated password for user '%s'" %
         username)
 
 

hooks/manager.py

@@ -3,6 +3,7 @@ from keystoneclient.v2_0 import client
 
 
 class KeystoneManager(object):
+
     def __init__(self, endpoint, token):
         self.api = client.Client(endpoint=endpoint, token=token)