remove unnecessary else; add params=None to delete group function

Author: s-szepe

dspace_rest_client/client.py

@@ -1626,28 +1626,27 @@ def add_subgroup(self, parent_uuid, child_uuid):
         response = self.api_post_uri(url, uri_list=data, params=None)
         if response.status_code == 204:
             return True
-        elif response.status_code == 401:
+        if response.status_code == 401:
             logging.error("You are not authenticated")
             return False
-        elif response.status_code == 403:
+        if response.status_code == 403:
             logging.error("You are not logged in with sufficient permissions")
             return False
-        elif response.status_code == 404:
+        if response.status_code == 404:
             logging.error("The parent group doesn't exist")
             return False
-        elif response.status_code == 422:
+        if response.status_code == 422:
             logging.error(
                 "The specified group is not found, or if adding the group would create a cyclic reference"
             )
             return False
-        else:
-            logging.error(
-                "Failed to add subgroup %s to group %s: %s",
-                child_uuid,
-                parent_uuid,
-                response.text,
-            )
-            return False
+        logging.error(
+            "Failed to add subgroup %s to group %s: %s",
+            child_uuid,
+            parent_uuid,
+            response.text,
+        )
+        return False
 
     def remove_subgroup(self, parent_uuid, child_uuid):
         """
@@ -1663,23 +1662,22 @@ def remove_subgroup(self, parent_uuid, child_uuid):
         if response.status_code == 401:
             logging.error("You are not authenticated")
             return False
-        elif response.status_code == 403:
+        if response.status_code == 403:
             logging.error("You are not logged in with sufficient permissions")
             return False
-        elif response.status_code == 404:
+        if response.status_code == 404:
             logging.error("The parent group doesn't exist")
             return False
-        elif response.status_code == 422:
+        if response.status_code == 422:
             logging.error("The specified group is not found")
             return False
-        else:
-            logging.error(
-                "Failed to remove subgroup %s from group %s: %s",
-                child_uuid,
-                parent_uuid,
-                response.text,
-            )
-            return False
+        logging.error(
+            "Failed to remove subgroup %s from group %s: %s",
+            child_uuid,
+            parent_uuid,
+            response.text,
+        )
+        return False
 
     def search_groups_by_metadata(self, query, page=0, size=20):
         """
@@ -1749,23 +1747,22 @@ def add_eperson_to_group(self, group_uuid, eperson_uuid):
         response = self.api_post_uri(url, uri_list=data, params=None)
         if response.status_code == 204:
             return True
-        elif response.status_code == 401:
+        if response.status_code == 401:
             logging.error("You are not authenticated")
             return False
-        elif response.status_code == 403:
+        if response.status_code == 403:
             logging.error("You are not logged in with sufficient permissions")
             return False
-        elif response.status_code == 422:
+        if response.status_code == 422:
             logging.error("The specified group or EPerson is not found")
             return False
-        else:
-            logging.error(
-                "Failed to add EPerson %s to group %s: %s",
-                eperson_uuid,
-                group_uuid,
-                response.text,
-            )
-            return False
+        logging.error(
+            "Failed to add EPerson %s to group %s: %s",
+            eperson_uuid,
+            group_uuid,
+            response.text,
+        )
+        return False
 
     def remove_eperson_from_group(self, group_uuid, eperson_uuid):
         """
@@ -1778,23 +1775,22 @@ def remove_eperson_from_group(self, group_uuid, eperson_uuid):
         response = self.api_delete(url, params=None)
         if response.status_code == 204:
             return True
-        elif response.status_code == 401:
+        if response.status_code == 401:
             logging.error("You are not authenticated")
             return False
-        elif response.status_code == 403:
+        if response.status_code == 403:
             logging.error("You are not logged in with sufficient permissions")
             return False
-        elif response.status_code == 422:
+        if response.status_code == 422:
             logging.error("The specified group or EPerson is not found")
             return False
-        else:
-            logging.error(
-                "Failed to remove EPerson %s from group %s: %s",
-                eperson_uuid,
-                group_uuid,
-                response.text,
-            )
-            return False
+        logging.error(
+            "Failed to remove EPerson %s from group %s: %s",
+            eperson_uuid,
+            group_uuid,
+            response.text,
+        )
+        return False
 
     def update_group_name(self, uuid, new_name):
         """
@@ -1817,7 +1813,7 @@ def delete_group(self, uuid):
         @return: Boolean indicating success or failure
         """
         url = f"{self.API_ENDPOINT}/eperson/groups/{uuid}"
-        response = self.api_delete(url)
+        response = self.api_delete(url, params=None)
         if response.status_code == 204:
             return True
         else: