Minor cleanups (#1190)

Make a refurn run on the code base.

Author: therve

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

@@ -131,8 +131,7 @@ class ApiClient(object):
 
         if return_http_data_only:
             return return_data
-        else:
-            return (return_data, response.status, response.getheaders())
+        return (return_data, response.status, response.getheaders())
 
     def parameters_to_multipart(self, params, collection_types):
         """Get parameters as list of tuples, formatting as json if value is collection_types.
@@ -170,7 +169,7 @@ class ApiClient(object):
         :return: The serialized form of data.
         """
         if isinstance(obj, (ModelNormal, ModelComposed)):
-            return {key: cls.sanitize_for_serialization(val) for key, val in model_to_dict(obj, serialize=True).items()}
+            return {key: cls.sanitize_for_serialization(val) for key, val in model_to_dict(obj).items()}
         elif isinstance(obj, io.IOBase):
             return cls.get_file_data_and_close_file(obj)
         elif isinstance(obj, (str, int, float, bool)) or obj is None:
@@ -306,7 +305,7 @@ class ApiClient(object):
 
         # post parameters
         if post_params or files:
-            post_params = post_params if post_params else []
+            post_params = post_params or []
             post_params = self.sanitize_for_serialization(post_params)
             post_params = self.parameters_to_tuples(post_params, collection_formats)
             post_params.extend(self.files_parameters(files))
@@ -338,7 +337,7 @@ class ApiClient(object):
             check_type,
         )
 
-    def parameters_to_tuples(self, params, collection_formats) -> List[Tuple[str, str]]:
+    def parameters_to_tuples(self, params, collection_formats) -> List[Tuple[str, Any]]:
         """Get parameters as list of tuples, formatting collections.
 
         :param params: Parameters as dict or list of two-tuples
@@ -426,8 +425,7 @@ class ApiClient(object):
 
         if "application/json" in content_types or "*/*" in content_types:
             return "application/json"
-        else:
-            return content_types[0]
+        return content_types[0]
 
 
 class ThreadedApiClient(ApiClient):
@@ -552,8 +550,7 @@ class AsyncApiClient(ApiClient):
 
         if return_http_data_only:
             return return_data
-        else:
-            return (return_data, response.status_code, response.headers)
+        return (return_data, response.status_code, response.headers)
 
 
 class Endpoint(object):

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

@@ -1,5 +1,6 @@
 {% include "api_info.j2" %}
 
+from contextlib import suppress
 from datetime import date, datetime
 import enum
 import inspect
@@ -310,7 +311,7 @@ class ModelSimple(OpenApiModel):
             return self.get(name)
 
         raise ApiAttributeError(
-            "{0} has no attribute '{1}'".format(type(self).__name__, name), [e for e in [self._path_to_item, name] if e]
+            "{0} has no attribute '{1}'".format(type(self).__name__, name), [e for e in (self._path_to_item, name) if e]
         )
 
     def __contains__(self, name):
@@ -371,7 +372,7 @@ class ModelNormal(OpenApiModel):
             return self.get(name)
 
         raise ApiAttributeError(
-            "{0} has no attribute '{1}'".format(type(self).__name__, name), [e for e in [self._path_to_item, name] if e]
+            "{0} has no attribute '{1}'".format(type(self).__name__, name), [e for e in (self._path_to_item, name) if e]
         )
 
     def __contains__(self, name):
@@ -515,7 +516,7 @@ class ModelComposed(OpenApiModel):
                 "Values stored for property {0} in {1} differ when looking "
                 "at self and self's composed instances. All values must be "
                 "the same".format(name, type(self).__name__),
-                [e for e in [self._path_to_item, name] if e],
+                [e for e in (self._path_to_item, name) if e],
             )
 
     def __getitem__(self, name):
@@ -524,7 +525,7 @@ class ModelComposed(OpenApiModel):
         if value is self.__unset_attribute_value__:
             raise ApiAttributeError(
                 "{0} has no attribute '{1}'".format(type(self).__name__, name),
-                [e for e in [self._path_to_item, name] if e],
+                [e for e in (self._path_to_item, name) if e],
             )
         return value
 
@@ -885,7 +886,7 @@ def order_response_types(required_types):
             return COERCION_INDEX_BY_TYPE[class_or_instance]
         raise ApiValueError("Unsupported type: %s" % class_or_instance)
 
-    sorted_types = sorted(required_types, key=lambda class_or_instance: index_getter(class_or_instance))
+    sorted_types = sorted(required_types, key=index_getter)
     return sorted_types
 
 
@@ -1034,9 +1035,7 @@ def deserialize_primitive(data, klass, path_to_item):
                 # The string should be in iso8601 datetime format.
                 parsed_datetime = parse(data)
                 date_only = (
-                    parsed_datetime.hour == 0
-                    and parsed_datetime.minute == 0
-                    and parsed_datetime.second == 0
+                    parsed_datetime.hour == parsed_datetime.minute == parsed_datetime.second == 0
                     and parsed_datetime.tzinfo is None
                     and 8 <= len(data) <= 10
                 )
@@ -1289,7 +1288,6 @@ def validate_and_convert_types(
             path_to_item,
             configuration,
             spec_property_naming,
-            key_type=False,
             must_convert=True,
             check_type=check_type,
         )
@@ -1307,8 +1305,6 @@ def validate_and_convert_types(
                 path_to_item,
                 configuration,
                 spec_property_naming,
-                key_type=False,
-                must_convert=False,
                 check_type=check_type,
             )
 
@@ -1506,7 +1502,7 @@ def get_oneof_instance(cls, model_kwargs, constant_kwargs, model_arg=None):
 
         single_value_input = allows_single_value_input(oneof_class)
 
-        try:
+        with suppress(Exception):
             if not single_value_input:
                 if constant_kwargs.get("_spec_property_naming"):
                     oneof_instance = oneof_class(
@@ -1531,8 +1527,6 @@ def get_oneof_instance(cls, model_kwargs, constant_kwargs, model_arg=None):
                         configuration=constant_kwargs.get("_configuration"),
                     )
                     oneof_instances.append(oneof_instance)
-        except Exception:
-            pass
     if len(oneof_instances) != 1:
         return UnparsedObject(**model_kwargs)
     return oneof_instances[0]
@@ -1548,7 +1542,7 @@ def get_discarded_args(self, composed_instances, model_args):
     # before __init__ was called
     for instance in composed_instances:
         all_keys = set(model_to_dict(instance, serialize=False).keys())
-        js_keys = model_to_dict(instance, serialize=True).keys()
+        js_keys = model_to_dict(instance).keys()
         all_keys.update(js_keys)
         discarded_keys = model_arg_keys - all_keys
         discarded_args.update(discarded_keys)

.generator/src/generator/templates/rest.j2

@@ -100,7 +100,6 @@ class RESTClientObject:
                                 (connection, read) timeouts.
         """
         method = method.upper()
-        assert method in ["GET", "HEAD", "DELETE", "POST", "PUT", "PATCH", "OPTIONS"]
 
         if post_params and body:
             raise ApiValueError("body parameter cannot be used with post_params parameter.")
@@ -117,9 +116,9 @@ class RESTClientObject:
 
         try:
             # For `POST`, `PUT`, `PATCH`, `OPTIONS`, `DELETE`
-            if method in ["POST", "PUT", "PATCH", "OPTIONS", "DELETE"]:
+            if method in ("POST", "PUT", "PATCH", "OPTIONS", "DELETE"):
                 # Only set a default Content-Type for POST, PUT, PATCH and OPTIONS requests
-                if (method != "DELETE") and ("Content-Type" not in headers):
+                if method != "DELETE" and "Content-Type" not in headers:
                     headers["Content-Type"] = "application/json"
                 if query_params:
                     url += "?" + urlencode(query_params)
@@ -172,7 +171,7 @@ class RESTClientObject:
                 # Pass a `string` parameter directly in the body to support
                 # other content types than Json when `body` argument is
                 # provided in serialized form
-                elif isinstance(body, str) or isinstance(body, bytes):
+                elif isinstance(body, (str, bytes)):
                     request_body = body
                     r = self.pool_manager.request(
                         method,

src/datadog_api_client/api_client.py

@@ -132,8 +132,7 @@ def _call_api(
 
         if return_http_data_only:
             return return_data
-        else:
-            return (return_data, response.status, response.getheaders())
+        return (return_data, response.status, response.getheaders())
 
     def parameters_to_multipart(self, params, collection_types):
         """Get parameters as list of tuples, formatting as json if value is collection_types.
@@ -171,7 +170,7 @@ def sanitize_for_serialization(cls, obj):
         :return: The serialized form of data.
         """
         if isinstance(obj, (ModelNormal, ModelComposed)):
-            return {key: cls.sanitize_for_serialization(val) for key, val in model_to_dict(obj, serialize=True).items()}
+            return {key: cls.sanitize_for_serialization(val) for key, val in model_to_dict(obj).items()}
         elif isinstance(obj, io.IOBase):
             return cls.get_file_data_and_close_file(obj)
         elif isinstance(obj, (str, int, float, bool)) or obj is None:
@@ -305,7 +304,7 @@ def call_api(
 
         # post parameters
         if post_params or files:
-            post_params = post_params if post_params else []
+            post_params = post_params or []
             post_params = self.sanitize_for_serialization(post_params)
             post_params = self.parameters_to_tuples(post_params, collection_formats)
             post_params.extend(self.files_parameters(files))
@@ -337,7 +336,7 @@ def call_api(
             check_type,
         )
 
-    def parameters_to_tuples(self, params, collection_formats) -> List[Tuple[str, str]]:
+    def parameters_to_tuples(self, params, collection_formats) -> List[Tuple[str, Any]]:
         """Get parameters as list of tuples, formatting collections.
 
         :param params: Parameters as dict or list of two-tuples
@@ -425,8 +424,7 @@ def select_header_content_type(self, content_types):
 
         if "application/json" in content_types or "*/*" in content_types:
             return "application/json"
-        else:
-            return content_types[0]
+        return content_types[0]
 
 
 class ThreadedApiClient(ApiClient):
@@ -551,8 +549,7 @@ async def _call_api(
 
         if return_http_data_only:
             return return_data
-        else:
-            return (return_data, response.status_code, response.headers)
+        return (return_data, response.status_code, response.headers)
 
 
 class Endpoint(object):

src/datadog_api_client/model_utils.py

@@ -2,6 +2,7 @@
 # This product includes software developed at Datadog (https://www.datadoghq.com/).
 # Copyright 2019-Present Datadog, Inc.
 
+from contextlib import suppress
 from datetime import date, datetime
 import enum
 import inspect
@@ -312,7 +313,7 @@ def __getitem__(self, name):
             return self.get(name)
 
         raise ApiAttributeError(
-            "{0} has no attribute '{1}'".format(type(self).__name__, name), [e for e in [self._path_to_item, name] if e]
+            "{0} has no attribute '{1}'".format(type(self).__name__, name), [e for e in (self._path_to_item, name) if e]
         )
 
     def __contains__(self, name):
@@ -373,7 +374,7 @@ def __getitem__(self, name):
             return self.get(name)
 
         raise ApiAttributeError(
-            "{0} has no attribute '{1}'".format(type(self).__name__, name), [e for e in [self._path_to_item, name] if e]
+            "{0} has no attribute '{1}'".format(type(self).__name__, name), [e for e in (self._path_to_item, name) if e]
         )
 
     def __contains__(self, name):
@@ -517,7 +518,7 @@ def get(self, name, default=None):
                 "Values stored for property {0} in {1} differ when looking "
                 "at self and self's composed instances. All values must be "
                 "the same".format(name, type(self).__name__),
-                [e for e in [self._path_to_item, name] if e],
+                [e for e in (self._path_to_item, name) if e],
             )
 
     def __getitem__(self, name):
@@ -526,7 +527,7 @@ def __getitem__(self, name):
         if value is self.__unset_attribute_value__:
             raise ApiAttributeError(
                 "{0} has no attribute '{1}'".format(type(self).__name__, name),
-                [e for e in [self._path_to_item, name] if e],
+                [e for e in (self._path_to_item, name) if e],
             )
         return value
 
@@ -887,7 +888,7 @@ def index_getter(class_or_instance):
             return COERCION_INDEX_BY_TYPE[class_or_instance]
         raise ApiValueError("Unsupported type: %s" % class_or_instance)
 
-    sorted_types = sorted(required_types, key=lambda class_or_instance: index_getter(class_or_instance))
+    sorted_types = sorted(required_types, key=index_getter)
     return sorted_types
 
 
@@ -1036,9 +1037,7 @@ def deserialize_primitive(data, klass, path_to_item):
                 # The string should be in iso8601 datetime format.
                 parsed_datetime = parse(data)
                 date_only = (
-                    parsed_datetime.hour == 0
-                    and parsed_datetime.minute == 0
-                    and parsed_datetime.second == 0
+                    parsed_datetime.hour == parsed_datetime.minute == parsed_datetime.second == 0
                     and parsed_datetime.tzinfo is None
                     and 8 <= len(data) <= 10
                 )
@@ -1291,7 +1290,6 @@ def validate_and_convert_types(
             path_to_item,
             configuration,
             spec_property_naming,
-            key_type=False,
             must_convert=True,
             check_type=check_type,
         )
@@ -1309,8 +1307,6 @@ def validate_and_convert_types(
                 path_to_item,
                 configuration,
                 spec_property_naming,
-                key_type=False,
-                must_convert=False,
                 check_type=check_type,
             )
 
@@ -1508,7 +1504,7 @@ def get_oneof_instance(cls, model_kwargs, constant_kwargs, model_arg=None):
 
         single_value_input = allows_single_value_input(oneof_class)
 
-        try:
+        with suppress(Exception):
             if not single_value_input:
                 if constant_kwargs.get("_spec_property_naming"):
                     oneof_instance = oneof_class(
@@ -1533,8 +1529,6 @@ def get_oneof_instance(cls, model_kwargs, constant_kwargs, model_arg=None):
                         configuration=constant_kwargs.get("_configuration"),
                     )
                     oneof_instances.append(oneof_instance)
-        except Exception:
-            pass
     if len(oneof_instances) != 1:
         return UnparsedObject(**model_kwargs)
     return oneof_instances[0]
@@ -1550,7 +1544,7 @@ def get_discarded_args(self, composed_instances, model_args):
     # before __init__ was called
     for instance in composed_instances:
         all_keys = set(model_to_dict(instance, serialize=False).keys())
-        js_keys = model_to_dict(instance, serialize=True).keys()
+        js_keys = model_to_dict(instance).keys()
         all_keys.update(js_keys)
         discarded_keys = model_arg_keys - all_keys
         discarded_args.update(discarded_keys)

src/datadog_api_client/rest.py

@@ -102,7 +102,6 @@ def request(
                                 (connection, read) timeouts.
         """
         method = method.upper()
-        assert method in ["GET", "HEAD", "DELETE", "POST", "PUT", "PATCH", "OPTIONS"]
 
         if post_params and body:
             raise ApiValueError("body parameter cannot be used with post_params parameter.")
@@ -119,9 +118,9 @@ def request(
 
         try:
             # For `POST`, `PUT`, `PATCH`, `OPTIONS`, `DELETE`
-            if method in ["POST", "PUT", "PATCH", "OPTIONS", "DELETE"]:
+            if method in ("POST", "PUT", "PATCH", "OPTIONS", "DELETE"):
                 # Only set a default Content-Type for POST, PUT, PATCH and OPTIONS requests
-                if (method != "DELETE") and ("Content-Type" not in headers):
+                if method != "DELETE" and "Content-Type" not in headers:
                     headers["Content-Type"] = "application/json"
                 if query_params:
                     url += "?" + urlencode(query_params)
@@ -174,7 +173,7 @@ def request(
                 # Pass a `string` parameter directly in the body to support
                 # other content types than Json when `body` argument is
                 # provided in serialized form
-                elif isinstance(body, str) or isinstance(body, bytes):
+                elif isinstance(body, (str, bytes)):
                     request_body = body
                     r = self.pool_manager.request(
                         method,