Merge "take_action() method from command.Command shouldn't return"

Author: Jenkins

openstackclient/identity/v3/consumer.py

@@ -60,7 +60,6 @@ def take_action(self, parsed_args):
         consumer = utils.find_resource(
             identity_client.oauth1.consumers, parsed_args.consumer)
         identity_client.oauth1.consumers.delete(consumer.id)
-        return
 
 
 class ListConsumer(command.Lister):
@@ -107,7 +106,6 @@ def take_action(self, parsed_args):
 
         consumer = identity_client.oauth1.consumers.update(
             consumer.id, **kwargs)
-        return
 
 
 class ShowConsumer(command.ShowOne):

openstackclient/identity/v3/credential.py

@@ -84,7 +84,6 @@ def get_parser(self, prog_name):
     def take_action(self, parsed_args):
         identity_client = self.app.client_manager.identity
         identity_client.credentials.delete(parsed_args.credential)
-        return
 
 
 class ListCredential(command.Lister):
@@ -155,8 +154,6 @@ def take_action(self, parsed_args):
                                            blob=parsed_args.data,
                                            project=project)
 
-        return
-
 
 class ShowCredential(command.ShowOne):
     """Show credential command"""

openstackclient/identity/v3/domain.py

@@ -100,7 +100,6 @@ def take_action(self, parsed_args):
         domain = utils.find_resource(identity_client.domains,
                                      parsed_args.domain)
         identity_client.domains.delete(domain.id)
-        return
 
 
 class ListDomain(command.Lister):
@@ -168,7 +167,6 @@ def take_action(self, parsed_args):
             sys.stdout.write("Domain not updated, no arguments present")
             return
         identity_client.domains.update(domain.id, **kwargs)
-        return
 
 
 class ShowDomain(command.ShowOne):

openstackclient/identity/v3/endpoint.py

@@ -109,7 +109,6 @@ def take_action(self, parsed_args):
         endpoint_id = utils.find_resource(identity_client.endpoints,
                                           parsed_args.endpoint).id
         identity_client.endpoints.delete(endpoint_id)
-        return
 
 
 class ListEndpoint(command.Lister):
@@ -221,7 +220,6 @@ def take_action(self, parsed_args):
         if parsed_args.service:
             service = common.find_service(identity_client, parsed_args.service)
             service_id = service.id
-
         enabled = None
         if parsed_args.enabled:
             enabled = True
@@ -237,8 +235,6 @@ def take_action(self, parsed_args):
             enabled=enabled
         )
 
-        return
-
 
 class ShowEndpoint(command.ShowOne):
     """Display endpoint details"""

openstackclient/identity/v3/federation_protocol.py

@@ -83,7 +83,6 @@ def take_action(self, parsed_args):
         identity_client = self.app.client_manager.identity
         identity_client.federation.protocols.delete(
             parsed_args.identity_provider, parsed_args.federation_protocol)
-        return
 
 
 class ListProtocols(command.Lister):

openstackclient/identity/v3/group.py

@@ -182,7 +182,6 @@ def take_action(self, parsed_args):
                                           group,
                                           parsed_args.domain)
             identity_client.groups.delete(group_obj.id)
-        return
 
 
 class ListGroup(command.Lister):
@@ -322,7 +321,6 @@ def take_action(self, parsed_args):
             sys.stderr.write("Group not updated, no arguments present")
             return
         identity_client.groups.update(group.id, **kwargs)
-        return
 
 
 class ShowGroup(command.ShowOne):

openstackclient/identity/v3/identity_provider.py

@@ -102,7 +102,6 @@ def take_action(self, parsed_args):
         identity_client = self.app.client_manager.identity
         identity_client.federation.identity_providers.delete(
             parsed_args.identity_provider)
-        return
 
 
 class ListIdentityProvider(command.Lister):

openstackclient/identity/v3/mapping.py

@@ -121,7 +121,6 @@ def take_action(self, parsed_args):
         identity_client = self.app.client_manager.identity
 
         identity_client.federation.mappings.delete(parsed_args.mapping)
-        return
 
 
 class ListMapping(command.Lister):

openstackclient/identity/v3/policy.py

@@ -69,7 +69,6 @@ def get_parser(self, prog_name):
     def take_action(self, parsed_args):
         identity_client = self.app.client_manager.identity
         identity_client.policies.delete(parsed_args.policy)
-        return
 
 
 class ListPolicy(command.Lister):
@@ -139,7 +138,6 @@ def take_action(self, parsed_args):
             sys.stdout.write('Policy not updated, no arguments present \n')
             return
         identity_client.policies.update(parsed_args.policy, **kwargs)
-        return
 
 
 class ShowPolicy(command.ShowOne):

openstackclient/identity/v3/project.py

@@ -153,7 +153,6 @@ def take_action(self, parsed_args):
                 project_obj = utils.find_resource(identity_client.projects,
                                                   project)
             identity_client.projects.delete(project_obj.id)
-        return
 
 
 class ListProject(command.Lister):
@@ -267,8 +266,8 @@ def take_action(self, parsed_args):
                 and not parsed_args.property
                 and not parsed_args.disable):
             return
-
-        project = common.find_project(identity_client, parsed_args.project,
+        project = common.find_project(identity_client,
+                                      parsed_args.project,
                                       parsed_args.domain)
 
         kwargs = {}
@@ -284,7 +283,6 @@ def take_action(self, parsed_args):
             kwargs.update(parsed_args.property)
 
         identity_client.projects.update(project.id, **kwargs)
-        return
 
 
 class ShowProject(command.ShowOne):