Upgraded to PEP8 1.3.3 to stay aligned with Nova, etc.

Made all the necessary changes to pass new PEP8 standards.

Also cleaned up docstrings to conform to the HACKING stanards.

Change-Id: Ib8df3030da7a7885655689ab5da0717748c9edbe

5 files changed, 98 insertions, 175 deletions

diff --git a/openstackclient/identity/v2_0/endpoint.py b/openstackclient/identity/v2_0/endpoint.py
index f9c689ec..4ce4fcb2 100644
--- a/openstackclient/identity/v2_0/endpoint.py
+++ b/openstackclient/identity/v2_0/endpoint.py
@@ -13,9 +13,7 @@
 #   under the License.
 #
 
-"""
-Endpoint action implementations
-"""
+"""Endpoint action implementations"""
 
 import logging
 
@@ -61,15 +59,14 @@ class CreateEndpoint(show.ShowOne):
     def take_action(self, parsed_args):
         self.log.debug('take_action(%s)' % parsed_args)
         identity_client = self.app.client_manager.identity
-        service = utils.find_resource(
-            identity_client.services, parsed_args.service)
+        service = utils.find_resource(identity_client.services,
+                                      parsed_args.service)
         endpoint = identity_client.endpoints.create(
             parsed_args.region,
             service.id,
             parsed_args.publicurl,
             parsed_args.adminurl,
-            parsed_args.internalurl,
-        )
+            parsed_args.internalurl,)
 
         info = {}
         info.update(endpoint._info)
@@ -119,7 +116,7 @@ class ListEndpoint(lister.Lister):
         identity_client = self.app.client_manager.identity
         if parsed_args.long:
             columns = ('ID', 'Region', 'Service Name', 'Service Type',
-                'PublicURL', 'AdminURL', 'InternalURL')
+                       'PublicURL', 'AdminURL', 'InternalURL')
         else:
             columns = ('ID', 'Region', 'Service Name', 'Service Type')
         data = identity_client.endpoints.list()
@@ -133,8 +130,7 @@ class ListEndpoint(lister.Lister):
                 (utils.get_item_properties(
                     s, columns,
                     formatters={},
-                ) for s in data),
-               )
+                ) for s in data))
 
 
 class ShowEndpoint(show.ShowOne):
@@ -154,7 +150,7 @@ class ShowEndpoint(show.ShowOne):
             metavar='<endpoint-type>',
             default='publicURL',
             help='Endpoint type: publicURL, internalURL, adminURL ' +
-                '(default publicURL)')
+                 '(default publicURL)')
         parser.add_argument(
             '--attr',
             metavar='<endpoint-attribute>',
@@ -196,8 +192,8 @@ class ShowEndpoint(show.ShowOne):
             # The Identity 2.0 API doesn't support retrieving a single
             # endpoint so we have to do this ourselves
             try:
-                service = utils.find_resource(
-                    identity_client.services, parsed_args.service)
+                service = utils.find_resource(identity_client.services,
+                                              parsed_args.service)
             except exceptions.CommandError:
                 try:
                     # search for service type
@@ -215,8 +211,8 @@ class ShowEndpoint(show.ShowOne):
                 if ep.service_id == service.id:
                     info = {}
                     info.update(ep._info)
-                    service = utils.find_resource(
-                        identity_client.services, ep.service_id)
+                    service = utils.find_resource(identity_client.services,
+                                                  ep.service_id)
                     info['service_name'] = service.name
                     info['service_type'] = service.type
                     return zip(*sorted(info.iteritems()))
diff --git a/openstackclient/identity/v2_0/role.py b/openstackclient/identity/v2_0/role.py
index 49e03653..5c905d91 100644
--- a/openstackclient/identity/v2_0/role.py
+++ b/openstackclient/identity/v2_0/role.py
@@ -13,9 +13,7 @@
 #   under the License.
 #
 
-"""
-Role action implementations
-"""
+"""Role action implementations"""
 
 import logging
 
@@ -37,36 +35,30 @@ class AddRole(show.ShowOne):
         parser.add_argument(
             'role',
             metavar='<role>',
-            help='Role name or ID to add to user',
-        )
+            help='Role name or ID to add to user')
         parser.add_argument(
             '--tenant',
             metavar='<tenant>',
             required=True,
-            help='Name or ID of tenant to include',
-        )
+            help='Name or ID of tenant to include')
         parser.add_argument(
             '--user',
             metavar='<user>',
             required=True,
-            help='Name or ID of user to include',
-        )
+            help='Name or ID of user to include')
         return parser
 
     def take_action(self, parsed_args):
         self.log.debug('take_action(%s)' % parsed_args)
         identity_client = self.app.client_manager.identity
-        role = utils.find_resource(
-            identity_client.roles, parsed_args.role)
-        tenant = utils.find_resource(
-            identity_client.tenants, parsed_args.tenant)
-        user = utils.find_resource(
-            identity_client.users, parsed_args.user)
+        role = utils.find_resource(identity_client.roles, parsed_args.role)
+        tenant = utils.find_resource(identity_client.tenants,
+                                     parsed_args.tenant)
+        user = utils.find_resource(identity_client.users, parsed_args.user)
         role = identity_client.roles.add_user_role(
             user,
             role,
-            tenant,
-        )
+            tenant)
 
         info = {}
         info.update(role._info)
@@ -84,16 +76,13 @@ class CreateRole(show.ShowOne):
         parser.add_argument(
             'role_name',
             metavar='<role-name>',
-            help='New role name',
-        )
+            help='New role name')
         return parser
 
     def take_action(self, parsed_args):
         self.log.debug('take_action(%s)' % parsed_args)
         identity_client = self.app.client_manager.identity
-        role = identity_client.roles.create(
-            parsed_args.role_name,
-        )
+        role = identity_client.roles.create(parsed_args.role_name)
 
         info = {}
         info.update(role._info)
@@ -111,15 +100,13 @@ class DeleteRole(command.Command):
         parser.add_argument(
             'role',
             metavar='<role>',
-            help='Name or ID of role to delete',
-        )
+            help='Name or ID of role to delete')
         return parser
 
     def take_action(self, parsed_args):
         self.log.debug('take_action(%s)' % parsed_args)
         identity_client = self.app.client_manager.identity
-        role = utils.find_resource(
-            identity_client.roles, parsed_args.role)
+        role = utils.find_resource(identity_client.roles, parsed_args.role)
         identity_client.roles.delete(role.id)
         return
 
@@ -138,8 +125,7 @@ class ListRole(lister.Lister):
                 (utils.get_item_properties(
                     s, columns,
                     formatters={},
-                ) for s in data),
-               )
+                ) for s in data))
 
 
 class ListUserRole(lister.Lister):
@@ -154,13 +140,11 @@ class ListUserRole(lister.Lister):
             'user',
             metavar='<user>',
             nargs='?',
-            help='Name or ID of user to include',
-        )
+            help='Name or ID of user to include')
         parser.add_argument(
             '--tenant',
             metavar='<tenant>',
-            help='Name or ID of tenant to include',
-        )
+            help='Name or ID of tenant to include')
         return parser
 
     def take_action(self, parsed_args):
@@ -176,10 +160,9 @@ class ListUserRole(lister.Lister):
         if not parsed_args.user:
             parsed_args.user = identity_client.auth_user_id
 
-        tenant = utils.find_resource(
-            identity_client.tenants, parsed_args.tenant)
-        user = utils.find_resource(
-            identity_client.users, parsed_args.user)
+        tenant = utils.find_resource(identity_client.tenants,
+                                     parsed_args.tenant)
+        user = utils.find_resource(identity_client.users, parsed_args.user)
 
         data = identity_client.roles.roles_for_user(user.id, tenant.id)
 
@@ -192,8 +175,7 @@ class ListUserRole(lister.Lister):
                 (utils.get_item_properties(
                     s, columns,
                     formatters={},
-                ) for s in data),
-               )
+                ) for s in data))
 
 
 class RemoveRole(command.Command):
@@ -207,36 +189,30 @@ class RemoveRole(command.Command):
         parser.add_argument(
             'role',
             metavar='<role>',
-            help='Role name or ID to remove from user',
-        )
+            help='Role name or ID to remove from user')
         parser.add_argument(
             '--tenant',
             metavar='<tenant>',
             required=True,
-            help='Name or ID of tenant',
-        )
+            help='Name or ID of tenant')
         parser.add_argument(
             '--user',
             metavar='<user>',
             required=True,
-            help='Name or ID of user',
-        )
+            help='Name or ID of user')
         return parser
 
     def take_action(self, parsed_args):
         self.log.debug('take_action(%s)' % parsed_args)
         identity_client = self.app.client_manager.identity
-        role = utils.find_resource(
-            identity_client.roles, parsed_args.role)
-        tenant = utils.find_resource(
-            identity_client.tenants, parsed_args.tenant)
-        user = utils.find_resource(
-            identity_client.users, parsed_args.user)
+        role = utils.find_resource(identity_client.roles, parsed_args.role)
+        tenant = utils.find_resource(identity_client.tenants,
+                                     parsed_args.tenant)
+        user = utils.find_resource(identity_client.users, parsed_args.user)
         identity_client.roles.remove_user_role(
             user.id,
             role.id,
-            tenant.id,
-        )
+            tenant.id)
 
 
 class ShowRole(show.ShowOne):
@@ -250,15 +226,13 @@ class ShowRole(show.ShowOne):
         parser.add_argument(
             'role',
             metavar='<role>',
-            help='Name or ID of role to display',
-        )
+            help='Name or ID of role to display')
         return parser
 
     def take_action(self, parsed_args):
         self.log.debug('take_action(%s)' % parsed_args)
         identity_client = self.app.client_manager.identity
-        role = utils.find_resource(
-            identity_client.roles, parsed_args.role)
+        role = utils.find_resource(identity_client.roles, parsed_args.role)
 
         info = {}
         info.update(role._info)
diff --git a/openstackclient/identity/v2_0/service.py b/openstackclient/identity/v2_0/service.py
index 89fe605a..21e32a51 100644
--- a/openstackclient/identity/v2_0/service.py
+++ b/openstackclient/identity/v2_0/service.py
@@ -13,9 +13,7 @@
 #   under the License.
 #
 
-"""
-Service action implementations
-"""
+"""Service action implementations"""
 
 import logging
 
@@ -44,13 +42,11 @@ class CreateService(show.ShowOne):
             '--type',
             metavar='<service-type>',
             required=True,
-            help='New service type',
-        )
+            help='New service type')
         parser.add_argument(
             '--description',
             metavar='<service-description>',
-            help='New service description',
-        )
+            help='New service description')
         return parser
 
     def take_action(self, parsed_args):
@@ -59,8 +55,7 @@ class CreateService(show.ShowOne):
         service = identity_client.services.create(
             parsed_args.name,
             parsed_args.type,
-            parsed_args.description,
-        )
+            parsed_args.description)
 
         info = {}
         info.update(service._info)
@@ -78,8 +73,7 @@ class DeleteService(command.Command):
         parser.add_argument(
             'service',
             metavar='<service-id>',
-            help='ID of service to delete',
-        )
+            help='ID of service to delete')
         return parser
 
     def take_action(self, parsed_args):
@@ -115,8 +109,7 @@ class ListService(lister.Lister):
                 (utils.get_item_properties(
                     s, columns,
                     formatters={},
-                ) for s in data),
-               )
+                ) for s in data))
 
 
 class ShowService(show.ShowOne):
@@ -138,8 +131,8 @@ class ShowService(show.ShowOne):
         identity_client = self.app.client_manager.identity
         try:
             # search for the usual ID or name
-            service = utils.find_resource(
-                identity_client.services, parsed_args.service)
+            service = utils.find_resource(identity_client.services,
+                                          parsed_args.service)
         except exceptions.CommandError:
             try:
                 # search for service type
@@ -149,7 +142,7 @@ class ShowService(show.ShowOne):
             #                 common client exceptions
             except identity_exc.NotFound:
                 msg = "No service with a type, name or ID of '%s' exists." % \
-                    name_or_id
+                      name_or_id
                 raise exceptions.CommandError(msg)
 
         info = {}
diff --git a/openstackclient/identity/v2_0/tenant.py b/openstackclient/identity/v2_0/tenant.py
index f24bc726..8a2f738f 100644
--- a/openstackclient/identity/v2_0/tenant.py
+++ b/openstackclient/identity/v2_0/tenant.py
@@ -13,9 +13,7 @@
 #   under the License.
 #
 
-"""
-Tenant action implementations
-"""
+"""Tenant action implementations"""
 
 import logging
 
@@ -37,27 +35,23 @@ class CreateTenant(show.ShowOne):
         parser.add_argument(
             'tenant_name',
             metavar='<tenant-name>',
-            help='New tenant name',
-        )
+            help='New tenant name')
         parser.add_argument(
             '--description',
             metavar='<tenant-description>',
-            help='New tenant description',
-        )
+            help='New tenant description')
         enable_group = parser.add_mutually_exclusive_group()
         enable_group.add_argument(
             '--enable',
             dest='enabled',
             action='store_true',
             default=True,
-            help='Enable tenant',
-        )
+            help='Enable tenant')
         enable_group.add_argument(
             '--disable',
             dest='enabled',
             action='store_false',
-            help='Disable tenant',
-        )
+            help='Disable tenant')
         return parser
 
     def take_action(self, parsed_args):
@@ -66,8 +60,7 @@ class CreateTenant(show.ShowOne):
         tenant = identity_client.tenants.create(
             parsed_args.tenant_name,
             description=parsed_args.description,
-            enabled=parsed_args.enabled,
-        )
+            enabled=parsed_args.enabled)
 
         info = {}
         info.update(tenant._info)
@@ -85,15 +78,14 @@ class DeleteTenant(command.Command):
         parser.add_argument(
             'tenant',
             metavar='<tenant>',
-            help='Name or ID of tenant to delete',
-        )
+            help='Name or ID of tenant to delete')
         return parser
 
     def take_action(self, parsed_args):
         self.log.debug('take_action(%s)' % parsed_args)
         identity_client = self.app.client_manager.identity
-        tenant = utils.find_resource(
-            identity_client.tenants, parsed_args.tenant)
+        tenant = utils.find_resource(identity_client.tenants,
+                                     parsed_args.tenant)
         identity_client.tenants.delete(tenant.id)
         return
 
@@ -110,8 +102,7 @@ class ListTenant(lister.Lister):
             '--long',
             action='store_true',
             default=False,
-            help='Additional fields are listed in output',
-        )
+            help='Additional fields are listed in output')
         return parser
 
     def take_action(self, parsed_args):
@@ -125,8 +116,7 @@ class ListTenant(lister.Lister):
                 (utils.get_item_properties(
                     s, columns,
                     formatters={},
-                ) for s in data),
-               )
+                ) for s in data))
 
 
 class SetTenant(command.Command):
@@ -140,39 +130,34 @@ class SetTenant(command.Command):
         parser.add_argument(
             'tenant',
             metavar='<tenant>',
-            help='Name or ID of tenant to change',
-        )
+            help='Name or ID of tenant to change')
         parser.add_argument(
             '--name',
             metavar='<new-tenant-name>',
-            help='New tenant name',
-        )
+            help='New tenant name')
         parser.add_argument(
             '--description',
             metavar='<tenant-description>',
-            help='New tenant description',
-        )
+            help='New tenant description')
         enable_group = parser.add_mutually_exclusive_group()
         enable_group.add_argument(
             '--enable',
             dest='enabled',
             action='store_true',
             default=True,
-            help='Enable tenant (default)',
-        )
+            help='Enable tenant (default)')
         enable_group.add_argument(
             '--disable',
             dest='enabled',
             action='store_false',
-            help='Disable tenant',
-        )
+            help='Disable tenant')
         return parser
 
     def take_action(self, parsed_args):
         self.log.debug('take_action(%s)' % parsed_args)
         identity_client = self.app.client_manager.identity
-        tenant = utils.find_resource(
-            identity_client.tenants, parsed_args.tenant)
+        tenant = utils.find_resource(identity_client.tenants,
+                                     parsed_args.tenant)
         kwargs = {}
         if parsed_args.name:
             kwargs['name'] = parsed_args.name
@@ -199,15 +184,14 @@ class ShowTenant(show.ShowOne):
         parser.add_argument(
             'tenant',
             metavar='<tenant>',
-            help='Name or ID of tenant to display',
-        )
+            help='Name or ID of tenant to display')
         return parser
 
     def take_action(self, parsed_args):
         self.log.debug('take_action(%s)' % parsed_args)
         identity_client = self.app.client_manager.identity
-        tenant = utils.find_resource(
-            identity_client.tenants, parsed_args.tenant)
+        tenant = utils.find_resource(identity_client.tenants,
+                                     parsed_args.tenant)
 
         info = {}
         info.update(tenant._info)
diff --git a/openstackclient/identity/v2_0/user.py b/openstackclient/identity/v2_0/user.py
index cf69d73f..2017e5e3 100644
--- a/openstackclient/identity/v2_0/user.py
+++ b/openstackclient/identity/v2_0/user.py
@@ -13,9 +13,7 @@
 #   under the License.
 #
 
-"""
-User action implementations
-"""
+"""User action implementations"""
 
 import logging
 
@@ -37,45 +35,39 @@ class CreateUser(show.ShowOne):
         parser.add_argument(
             'name',
             metavar='<user-name>',
-            help='New user name',
-        )
+            help='New user name')
         parser.add_argument(
             '--password',
             metavar='<user-password>',
-            help='New user password',
-        )
+            help='New user password')
         parser.add_argument(
             '--email',
             metavar='<user-email>',
-            help='New user email address',
-        )
+            help='New user email address')
         parser.add_argument(
             '--tenant',
             metavar='<tenant>',
-            help='New default tenant name or ID',
-        )
+            help='New default tenant name or ID')
         enable_group = parser.add_mutually_exclusive_group()
         enable_group.add_argument(
             '--enable',
             dest='enabled',
             action='store_true',
             default=True,
-            help='Enable user',
-        )
+            help='Enable user')
         enable_group.add_argument(
             '--disable',
             dest='enabled',
             action='store_false',
-            help='Disable user',
-        )
+            help='Disable user')
         return parser
 
     def take_action(self, parsed_args):
         self.log.debug('take_action(%s)' % parsed_args)
         identity_client = self.app.client_manager.identity
         if parsed_args.tenant:
-            tenant_id = utils.find_resource(
-                identity_client.tenants, parsed_args.tenant).id
+            tenant_id = utils.find_resource(identity_client.tenants,
+                                            parsed_args.tenant).id
         else:
             tenant_id = None
         user = identity_client.users.create(
@@ -83,8 +75,7 @@ class CreateUser(show.ShowOne):
             parsed_args.password,
             parsed_args.email,
             tenant_id=tenant_id,
-            enabled=parsed_args.enabled,
-        )
+            enabled=parsed_args.enabled)
 
         info = {}
         info.update(user._info)
@@ -102,15 +93,13 @@ class DeleteUser(command.Command):
         parser.add_argument(
             'user',
             metavar='<user>',
-            help='Name or ID of user to delete',
-        )
+            help='Name or ID of user to delete')
         return parser
 
     def take_action(self, parsed_args):
         self.log.debug('take_action(%s)' % parsed_args)
         identity_client = self.app.client_manager.identity
-        user = utils.find_resource(
-            identity_client.users, parsed_args.user)
+        user = utils.find_resource(identity_client.users, parsed_args.user)
         identity_client.users.delete(user.id)
         return
 
@@ -126,14 +115,12 @@ class ListUser(lister.Lister):
         parser.add_argument(
             '--tenant',
             metavar='<tenant>',
-            help='Name or ID of tenant to filter users',
-        )
+            help='Name or ID of tenant to filter users')
         parser.add_argument(
             '--long',
             action='store_true',
             default=False,
-            help='Additional fields are listed in output',
-        )
+            help='Additional fields are listed in output')
         return parser
 
     def take_action(self, parsed_args):
@@ -147,8 +134,7 @@ class ListUser(lister.Lister):
                 (utils.get_item_properties(
                     s, columns,
                     formatters={},
-                ) for s in data),
-               )
+                ) for s in data))
 
 
 class SetUser(command.Command):
@@ -162,57 +148,49 @@ class SetUser(command.Command):
         parser.add_argument(
             'user',
             metavar='<user>',
-            help='Name or ID of user to change',
-        )
+            help='Name or ID of user to change')
         parser.add_argument(
             '--name',
             metavar='<new-user-name>',
-            help='New user name',
-        )
+            help='New user name')
         parser.add_argument(
             '--password',
             metavar='<user-password>',
-            help='New user password',
-        )
+            help='New user password')
         parser.add_argument(
             '--email',
             metavar='<user-email>',
-            help='New user email address',
-        )
+            help='New user email address')
         parser.add_argument(
             '--tenant',
             metavar='<tenant>',
-            help='New default tenant name or ID',
-        )
+            help='New default tenant name or ID')
         enable_group = parser.add_mutually_exclusive_group()
         enable_group.add_argument(
             '--enable',
             dest='enabled',
             action='store_true',
             default=True,
-            help='Enable user (default)',
-        )
+            help='Enable user (default)')
         enable_group.add_argument(
             '--disable',
             dest='enabled',
             action='store_false',
-            help='Disable user',
-        )
+            help='Disable user')
         return parser
 
     def take_action(self, parsed_args):
         self.log.debug('take_action(%s)' % parsed_args)
         identity_client = self.app.client_manager.identity
-        user = utils.find_resource(
-            identity_client.users, parsed_args.user)
+        user = utils.find_resource(identity_client.users, parsed_args.user)
         kwargs = {}
         if parsed_args.name:
             kwargs['name'] = parsed_args.name
         if parsed_args.email:
             kwargs['email'] = parsed_args.email
         if parsed_args.tenant:
-            tenant_id = utils.find_resource(
-                identity_client.tenants, parsed_args.tenant).id
+            tenant_id = utils.find_resource(identity_client.tenants,
+                                            parsed_args.tenant).id
             kwargs['tenantId'] = tenant_id
         if 'enabled' in parsed_args:
             kwargs['enabled'] = parsed_args.enabled
@@ -235,15 +213,13 @@ class ShowUser(show.ShowOne):
         parser.add_argument(
             'user',
             metavar='<user>',
-            help='Name or ID of user to display',
-        )
+            help='Name or ID of user to display')
         return parser
 
     def take_action(self, parsed_args):
         self.log.debug('take_action(%s)' % parsed_args)
         identity_client = self.app.client_manager.identity
-        user = utils.find_resource(
-            identity_client.users, parsed_args.user)
+        user = utils.find_resource(identity_client.users, parsed_args.user)
 
         info = {}
         info.update(user._info)