Remove unnecessary default value from dict.get

Author: philippthun

integration/v2/test_applications.py

@@ -48,8 +48,8 @@ def test_list(self):
                     self.assertEqual(e.body.get("error_code"), "CF-AppStoppedStatsError")
                 env = client.v2.apps.get_env(application["metadata"]["guid"])
                 self.assertIsNotNone(env)
-                self.assertIsNotNone(env.get("application_env_json", None))
-                self.assertIsNotNone(env["application_env_json"].get("VCAP_APPLICATION", None))
+                self.assertIsNotNone(env.get("application_env_json"))
+                self.assertIsNotNone(env["application_env_json"].get("VCAP_APPLICATION"))
                 self.assertGreater(len(env["application_env_json"]["VCAP_APPLICATION"].get("application_uris", [])), 0)
                 _logger.debug("env = %s", json.dumps(env))
             cpt += 1

main/cloudfoundry_client/client.py

@@ -205,7 +205,7 @@ def _is_token_expired(response: Response) -> bool:
             try:
                 json_data = response.json()
                 invalid_token_error = "CF-InvalidAuthToken"
-                if json_data.get("errors", None) is not None:  # V3 error response
+                if json_data.get("errors") is not None:  # V3 error response
                     for error in json_data.get("errors"):
                         if error.get("code", 0) == 1000 and error.get("title", "") == invalid_token_error:
                             _logger.info("_is_token_v3_expired - true")
@@ -295,4 +295,4 @@ def _check_response(response: Response) -> Response:
                 body = response.json()
             except ValueError:
                 body = response.text
-            raise InvalidStatusCode(HTTPStatus(response.status_code), body, response.headers.get("x-vcap-request-id", None))
+            raise InvalidStatusCode(HTTPStatus(response.status_code), body, response.headers.get("x-vcap-request-id"))

main/cloudfoundry_client/operations/push/validation/manifest.py

@@ -126,7 +126,7 @@ def _absolute_path(manifest_directory: str, manifest: dict):
 
     @staticmethod
     def _convert_environment(app_manifest: dict):
-        environment = app_manifest.get("env", None)
+        environment = app_manifest.get("env")
         if environment is not None:
             if type(environment) != dict:
                 raise AssertionError("'env' entry must be a dictionary")

main/cloudfoundry_client/v3/entities.py

@@ -244,9 +244,9 @@ def _mixin_included_resources(self, result: JsonObject) -> JsonObject:
     def _include_resources(self, resource: JsonObject, result: JsonObject) -> None:
         for relationship_name, relationship in resource.get("relationships", {}).items():
             relationship_guid = (relationship.get("data") or {}).get("guid")
-            included_resources = result["included"].get(plural(relationship_name), None)
+            included_resources = result["included"].get(plural(relationship_name))
             if relationship_guid is not None and included_resources is not None:
-                included_resource = next((r for r in included_resources if relationship_guid == r.get("guid", None)), None)
+                included_resource = next((r for r in included_resources if relationship_guid == r.get("guid")), None)
                 if included_resource is not None:
                     self._include_resources(included_resource, result)
                     included = resource.setdefault("_included", {})