pyupgrade python3.9 plus

Author: mavwolverine

example/connexion-example/hello.py

@@ -14,11 +14,11 @@
 def post_greeting(name):
     logger.info("test log statement")
     logger.info("test log statement with extra props", extra={'props': {"extra_property": 'extra_value'}})
-    return 'Hello {name}'.format(name=name)
+    return f'Hello {name}'
 
 
 def exclude_from_request_instrumentation(name):
-    return 'Hello {name}. this request wont log request instrumentation information'.format(name=name)
+    return f'Hello {name}. this request wont log request instrumentation information'
 
 
 def create():

example/custom_log_format_request.py

@@ -19,7 +19,7 @@ def _format_log_object(self, record, request_util):
         request = record.request_response_data._request
         response = record.request_response_data._response
 
-        json_log_object = super(CustomRequestJSONLog, self)._format_log_object(record, request_util)
+        json_log_object = super()._format_log_object(record, request_util)
         json_log_object.update({
             "customized_prop": "customized value",
         })
@@ -32,10 +32,10 @@ class CustomDefaultRequestResponseDTO(json_logging.dto.DefaultRequestResponseDTO
     """
 
     def __init__(self, request, **kwargs):
-        super(CustomDefaultRequestResponseDTO, self).__init__(request, **kwargs)
+        super().__init__(request, **kwargs)
 
     def on_request_complete(self, response):
-        super(CustomDefaultRequestResponseDTO, self).on_request_complete(response)
+        super().on_request_complete(response)
         self.status = response.status
 
 

json_logging/__init__.py

@@ -1,4 +1,3 @@
-# coding=utf-8
 import json
 import logging
 import sys

json_logging/dto.py

@@ -14,7 +14,7 @@ def __init__(self, request, **kwargs):
         invoked when request start, where to extract any necessary information from the request object
         :param request: request object
         """
-        super(RequestResponseDTOBase, self).__init__(**kwargs)
+        super().__init__(**kwargs)
         self._request = request
 
     def on_request_complete(self, response):
@@ -31,14 +31,14 @@ class DefaultRequestResponseDTO(RequestResponseDTOBase):
     """
 
     def __init__(self, request, **kwargs):
-        super(DefaultRequestResponseDTO, self).__init__(request, **kwargs)
+        super().__init__(request, **kwargs)
         utcnow = datetime.now(timezone.utc)
         self._request_start = utcnow
         self["request_received_at"] = util.iso_time_format(utcnow)
 
     # noinspection PyAttributeOutsideInit
     def on_request_complete(self, response):
-        super(DefaultRequestResponseDTO, self).on_request_complete(response)
+        super().on_request_complete(response)
         utcnow = datetime.now(timezone.utc)
         time_delta = utcnow - self._request_start
         self["response_time_ms"] = int(time_delta.total_seconds()) * 1000 + int(time_delta.microseconds / 1000)

json_logging/formatters.py

@@ -22,11 +22,8 @@
 except NameError:
     basestring = str
 
-if sys.version_info < (3, 0):
-    EASY_SERIALIZABLE_TYPES = (basestring, bool, dict, float, int, list, type(None))
-else:
-    LOG_RECORD_BUILT_IN_ATTRS.append('stack_info')
-    EASY_SERIALIZABLE_TYPES = (str, bool, dict, float, int, list, type(None))
+LOG_RECORD_BUILT_IN_ATTRS.append('stack_info')
+EASY_SERIALIZABLE_TYPES = (str, bool, dict, float, int, list, type(None))
 
 
 def _sanitize_log_msg(record):
@@ -45,7 +42,7 @@ class BaseJSONFormatter(logging.Formatter):
     base_object_common = {}
 
     def __init__(self, *args, **kw):
-        super(BaseJSONFormatter, self).__init__(*args, **kw)
+        super().__init__(*args, **kw)
         if json_logging.COMPONENT_ID and json_logging.COMPONENT_ID != json_logging.EMPTY_VALUE:
             self.base_object_common["component_id"] = json_logging.COMPONENT_ID
         if json_logging.COMPONENT_NAME and json_logging.COMPONENT_NAME != json_logging.EMPTY_VALUE:
@@ -120,7 +117,7 @@ def format_exception(cls, exc_info):
         return ''.join(traceback.format_exception(*exc_info)) if exc_info else ''
 
     def _format_log_object(self, record, request_util):
-        json_log_object = super(JSONLogFormatter, self)._format_log_object(record, request_util)
+        json_log_object = super()._format_log_object(record, request_util)
 
         json_log_object.update({
             "msg": _sanitize_log_msg(record),
@@ -144,7 +141,7 @@ class JSONLogWebFormatter(JSONLogFormatter):
     """
 
     def _format_log_object(self, record, request_util):
-        json_log_object = super(JSONLogWebFormatter, self)._format_log_object(record, request_util)
+        json_log_object = super()._format_log_object(record, request_util)
 
         if json_logging.CORRELATION_ID_FIELD not in json_log_object:
             json_log_object.update({
@@ -160,7 +157,7 @@ class JSONRequestLogFormatter(BaseJSONFormatter):
     """
 
     def _format_log_object(self, record, request_util):
-        json_log_object = super(JSONRequestLogFormatter, self)._format_log_object(record, request_util)
+        json_log_object = super()._format_log_object(record, request_util)
 
         request_adapter = request_util.request_adapter
         response_adapter = request_util.response_adapter

json_logging/framework/__init__.py

@@ -1 +0,0 @@
-# coding=utf-8

json_logging/framework/connexion/__init__.py

@@ -1,4 +1,3 @@
-# coding=utf-8
 import logging
 import sys
 

json_logging/framework/fastapi/__init__.py

@@ -1,4 +1,3 @@
-
 def is_fastapi_present():
     # noinspection PyPep8,PyBroadException
     try:

json_logging/framework/flask/__init__.py

@@ -1,4 +1,3 @@
-# coding=utf-8
 import logging
 
 import json_logging

json_logging/framework/quart/__init__.py

@@ -1,4 +1,3 @@
-# coding=utf-8
 import logging
 import sys