Fix nits found by static analysis (#1545)

Author: therve

.generator/src/generator/openapi.py

@@ -217,7 +217,6 @@ def child_models(schema, alternative_name=None, seen=None, in_list=False):
             seen.add(name)
             yield name, schema
 
-
     if "enum" in schema:
         if name is None:
             raise ValueError(f"Schema {schema} has no name")
@@ -623,12 +622,12 @@ def format_server(server, path):
             url = server["url"] + path
             # replace potential path variables
             for variable, value in server_variables.items():
-                url = url.replace("{" + variable + "}", value)
+                url = url.replace(f"{{{variable}}}", value)
             # replace server variables if they were not replace before
             for variable in server["variables"]:
                 if variable in server_variables:
                     continue
-                url = url.replace("{" + variable + "}", server["variables"][variable]["default"])
+                url = url.replace(f"{{{variable}}}", server["variables"][variable]["default"])
             return url
 
         server_variables = server_variables or {}

.generator/src/generator/templates/api_client.j2

@@ -175,7 +175,7 @@ class ApiClient:
         elif isinstance(obj, (datetime, date)):
             if getattr(obj, "tzinfo", None) is not None:
                 return obj.isoformat()
-            return obj.strftime("%Y-%m-%dT%H:%M:%S") + obj.strftime(".%f")[:4] + "Z"
+            return "{}Z".format(obj.strftime("%Y-%m-%dT%H:%M:%S.%f")[:-3])
         elif isinstance(obj, ModelSimple):
             return cls.sanitize_for_serialization(obj.value)
         elif isinstance(obj, (list, tuple)):

.generator/src/generator/templates/configuration.j2

@@ -361,8 +361,7 @@ class Configuration:
             prefix = self.api_key_prefix.get(identifier)
             if prefix:
                 return "%s %s" % (prefix, key)
-            else:
-                return key
+            return key
 
     def get_basic_auth_token(self):
         """Gets HTTP basic authentication header (string).
@@ -427,8 +426,8 @@ class Configuration:
             server = servers[index]
         except IndexError:
             raise ValueError(
-                "Invalid index {0} when selecting the host settings. "
-                "Must be less than {1}".format(index, len(servers))
+                "Invalid index {} when selecting the host settings. "
+                "Must be less than {}".format(index, len(servers))
             )
 
         url = server["url"]
@@ -439,11 +438,11 @@ class Configuration:
 
             if "enum_values" in variable and used_value not in variable["enum_values"]:
                 raise ValueError(
-                    "The variable `{0}` in the host URL has invalid value "
-                    "{1}. Must be {2}.".format(variable_name, variables[variable_name], variable["enum_values"])
+                    "The variable `{}` in the host URL has invalid value "
+                    "{}. Must be {}.".format(variable_name, variables[variable_name], variable["enum_values"])
                 )
 
-            url = url.replace("{" + variable_name + "}", used_value)
+            {% raw %}url = url.replace(f"{{{variable_name}}}", used_value){%- endraw %}
 
         return url
 

.generator/src/generator/templates/model_utils.j2

@@ -1093,7 +1093,7 @@ def deserialize_model(model_data, model_class, path_to_item, check_type, configu
             return model_class(model_data, **kw_args)
         else:
             return model_class(*model_data, **kw_args)
-    if isinstance(model_data, dict):
+    elif isinstance(model_data, dict):
         kw_args.update(change_keys_js_to_python(model_data, model_class))
         return model_class(**kw_args)
     elif isinstance(model_data, PRIMITIVE_TYPES):

src/datadog_api_client/api_client.py

@@ -176,7 +176,7 @@ def sanitize_for_serialization(cls, obj):
         elif isinstance(obj, (datetime, date)):
             if getattr(obj, "tzinfo", None) is not None:
                 return obj.isoformat()
-            return obj.strftime("%Y-%m-%dT%H:%M:%S") + obj.strftime(".%f")[:4] + "Z"
+            return "{}Z".format(obj.strftime("%Y-%m-%dT%H:%M:%S.%f")[:-3])
         elif isinstance(obj, ModelSimple):
             return cls.sanitize_for_serialization(obj.value)
         elif isinstance(obj, (list, tuple)):

src/datadog_api_client/configuration.py

@@ -390,8 +390,7 @@ def get_api_key_with_prefix(self, identifier, alias=None):
             prefix = self.api_key_prefix.get(identifier)
             if prefix:
                 return "%s %s" % (prefix, key)
-            else:
-                return key
+            return key
 
     def get_basic_auth_token(self):
         """Gets HTTP basic authentication header (string).
@@ -483,8 +482,7 @@ def get_host_from_settings(self, index, variables=None, servers=None):
             server = servers[index]
         except IndexError:
             raise ValueError(
-                "Invalid index {0} when selecting the host settings. "
-                "Must be less than {1}".format(index, len(servers))
+                "Invalid index {} when selecting the host settings. " "Must be less than {}".format(index, len(servers))
             )
 
         url = server["url"]
@@ -495,11 +493,11 @@ def get_host_from_settings(self, index, variables=None, servers=None):
 
             if "enum_values" in variable and used_value not in variable["enum_values"]:
                 raise ValueError(
-                    "The variable `{0}` in the host URL has invalid value "
-                    "{1}. Must be {2}.".format(variable_name, variables[variable_name], variable["enum_values"])
+                    "The variable `{}` in the host URL has invalid value "
+                    "{}. Must be {}.".format(variable_name, variables[variable_name], variable["enum_values"])
                 )
 
-            url = url.replace("{" + variable_name + "}", used_value)
+            url = url.replace(f"{{{variable_name}}}", used_value)
 
         return url
 

src/datadog_api_client/model_utils.py

@@ -1096,7 +1096,7 @@ def deserialize_model(model_data, model_class, path_to_item, check_type, configu
             return model_class(model_data, **kw_args)
         else:
             return model_class(*model_data, **kw_args)
-    if isinstance(model_data, dict):
+    elif isinstance(model_data, dict):
         kw_args.update(change_keys_js_to_python(model_data, model_class))
         return model_class(**kw_args)
     elif isinstance(model_data, PRIMITIVE_TYPES):