Merge pull request #204 from cloudfoundry-community/dependabot/pip/flake8-6.1.0

Bump flake8 from 5.0.4 to 6.1.0

Author: antechrestos

dev-requirements.txt

@@ -1,3 +1,3 @@
 black==23.12.1
-flake8==5.0.4
+flake8==6.1.0
 setuptools; python_version >= '3.12'

main/cloudfoundry_client/errors.py

@@ -14,7 +14,7 @@ def __init__(self, status_code: HTTPStatus, body, request_id=None):
 
     def __str__(self):
         error_message = self.status_code.name
-        if type(self.body) == str:
+        if isinstance(self.body, str):
             error_message += f" = {self.body}"
         else:
             error_message += f" = {json.dumps(self.body)}"

main/cloudfoundry_client/main/main.py

@@ -110,7 +110,7 @@ def build_client_from_configuration(previous_configuration: dict = None) -> Clou
                 client.init_with_token(configuration["refresh_token"])
                 return client
         except Exception as ex:
-            if type(ex) == ConnectionError:
+            if isinstance(ex, ConnectionError):
                 raise
             else:
                 _logger.exception("Could not restore configuration. Cleaning and recreating")

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

@@ -90,12 +90,12 @@ def _convert_positive(manifest: dict, field: str):
     def _convert_boolean(manifest: dict, field: str):
         if field in manifest:
             field_value = manifest[field]
-            manifest[field] = field_value if type(field_value) == bool else field_value.lower() == "true"
+            manifest[field] = field_value if isinstance(field_value, bool) else field_value.lower() == "true"
 
     @staticmethod
     def _validate_routes(manifest: dict):
         for route in manifest.get("routes", []):
-            if type(route) != dict or "route" not in route:
+            if not (isinstance(route, dict)) or "route" not in route:
                 raise AssertionError("routes attribute must be a list of object containing a route attribute")
 
     @staticmethod
@@ -125,11 +125,14 @@ def _absolute_path(manifest_directory: str, manifest: dict):
     def _convert_environment(app_manifest: dict):
         environment = app_manifest.get("env")
         if environment is not None:
-            if type(environment) != dict:
+            if not (isinstance(environment, dict)):
                 raise AssertionError("'env' entry must be a dictionary")
             app_manifest["env"] = {
-                key: json.dumps(value) for key, value in environment.items() if value is not None and type(value) != str
+                key: json.dumps(value) for key, value in environment.items()
+                if value is not None and not (isinstance(value, str))
+            }
+            app_manifest["env"].update({
+                key: value for key, value in environment.items()
+                if value is not None and isinstance(value, str)
             }
-            app_manifest["env"].update(
-                {key: value for key, value in environment.items() if value is not None and type(value) == str}
             )

main/cloudfoundry_client/v2/apps.py

@@ -195,11 +195,11 @@ def _wait_for_instances_in_state(
                 sleep(check_time)
                 sum_waiting += check_time
 
-    def _safe_get_instances(self, application_guid: str) -> JsonObject:
+    def _safe_get_instances(self, application_guid: str) -> Dict[str, JsonObject]:
         try:
             return self.get_instances(application_guid)
         except InvalidStatusCode as ex:
-            if ex.status_code == HTTPStatus.BAD_REQUEST and type(ex.body) == dict:
+            if ex.status_code == HTTPStatus.BAD_REQUEST and isinstance(ex.body, dict):
                 code = ex.body.get("code", -1)
                 # 170002: staging not finished
                 # 220001: instances error