Merge remote-tracking branch 'origin/main' into fix-linter-pyteststyle

Author: TimPansino

newrelic/__init__.py

@@ -17,7 +17,7 @@
 THIS_DIR = os.path.dirname(__file__)
 
 try:
-    with open(os.path.join(THIS_DIR, "version.txt"), "r") as f:
+    with open(os.path.join(THIS_DIR, "version.txt")) as f:
         version = f.read()
 except:
     version = "0.0.0"

newrelic/admin/generate_config.py

@@ -32,7 +32,8 @@ def generate_config(args):
 
     config_file = os.path.join(package_root, "newrelic.ini")
 
-    content = open(config_file, "r").read()
+    with open(config_file) as f:
+        content = f.read()
 
     if len(args) >= 1:
         content = content.replace("*** REPLACE ME ***", args[0])

newrelic/api/asgi_application.py

@@ -209,7 +209,7 @@ def __init__(self, application, scope, receive, send, source=None):
         request_path = scope["path"]
         query_string = scope["query_string"]
         headers = scope["headers"] = tuple(scope["headers"])
-        super(ASGIWebTransaction, self).__init__(
+        super().__init__(
             application=application,
             name=None,
             scheme=scheme,

newrelic/api/background_task.py

@@ -25,7 +25,7 @@ class BackgroundTask(Transaction):
     def __init__(self, application, name, group=None, source=None):
         # Initialise the common transaction base class.
 
-        super(BackgroundTask, self).__init__(application, source=source)
+        super().__init__(application, source=source)
 
         # Mark this as a background task even if disabled.
 

newrelic/api/cat_header_mixin.py

@@ -34,7 +34,7 @@ class CatHeaderMixin:
     settings = None
 
     def __enter__(self):
-        result = super(CatHeaderMixin, self).__enter__()
+        result = super().__enter__()
         if result is self and self.transaction:
             self.settings = self.transaction.settings or None
         return result

newrelic/api/database_trace.py

@@ -69,7 +69,7 @@ def __init__(
         if kwargs:
             raise TypeError("Invalid keyword arguments:", kwargs)
 
-        super(DatabaseTrace, self).__init__(parent=parent, source=source)
+        super().__init__(parent=parent, source=source)
 
         self.sql = sql
 
@@ -84,7 +84,7 @@ def __init__(
         self.database_name = database_name
 
     def __enter__(self):
-        result = super(DatabaseTrace, self).__enter__()
+        result = super().__enter__()
         if result and self.transaction:
             self.sql = self.transaction._intern_string(self.sql)
         return result

newrelic/api/datastore_trace.py

@@ -61,7 +61,7 @@ def __init__(self, product, target, operation, host=None, port_path_or_id=None,
         if kwargs:
             raise TypeError("Invalid keyword arguments:", kwargs)
 
-        super(DatastoreTrace, self).__init__(parent=parent, source=source)
+        super().__init__(parent=parent, source=source)
 
         self.instance_reporting_enabled = False
         self.database_name_enabled = False
@@ -75,7 +75,7 @@ def __init__(self, product, target, operation, host=None, port_path_or_id=None,
         self.database_name = database_name
 
     def __enter__(self):
-        result = super(DatastoreTrace, self).__enter__()
+        result = super().__enter__()
         if result and self.transaction:
             transaction = self.transaction
 

newrelic/api/external_trace.py

@@ -28,7 +28,7 @@ def __init__(self, library, url, method=None, **kwargs):
         if kwargs:
             raise TypeError("Invalid keyword arguments:", kwargs)
 
-        super(ExternalTrace, self).__init__(parent=parent, source=source)
+        super().__init__(parent=parent, source=source)
 
         self.library = library
         self.url = url

newrelic/api/function_trace.py

@@ -28,7 +28,7 @@ def __init__(self, name, group=None, label=None, params=None, terminal=False, ro
         if kwargs:
             raise TypeError("Invalid keyword arguments:", kwargs)
 
-        super(FunctionTrace, self).__init__(parent=parent, source=source)
+        super().__init__(parent=parent, source=source)
 
         # Handle incorrect groupings and leading slashes. This will
         # cause an empty segment which we want to avoid. In that case

newrelic/api/graphql_trace.py

@@ -28,7 +28,7 @@ def __init__(self, **kwargs):
         if kwargs:
             raise TypeError("Invalid keyword arguments:", kwargs)
 
-        super(GraphQLOperationTrace, self).__init__(parent=parent, source=source)
+        super().__init__(parent=parent, source=source)
 
         self.operation_name = "<anonymous>"
         self.operation_type = "<unknown>"
@@ -70,7 +70,7 @@ def finalize_data(self, transaction, exc=None, value=None, tb=None):
         self.graphql = graphql = self.formatted[:limit]
         self._add_agent_attribute("graphql.operation.query", graphql)
 
-        return super(GraphQLOperationTrace, self).finalize_data(transaction, exc=None, value=None, tb=None)
+        return super().finalize_data(transaction, exc=None, value=None, tb=None)
 
     def create_node(self):
         return GraphQLOperationNode(
@@ -136,7 +136,7 @@ def __init__(self, field_name=None, field_parent_type=None, field_return_type=No
         if kwargs:
             raise TypeError("Invalid keyword arguments:", kwargs)
 
-        super(GraphQLResolverTrace, self).__init__(parent=parent, source=source)
+        super().__init__(parent=parent, source=source)
 
         self.field_name = field_name
         self.field_parent_type = field_parent_type
@@ -148,7 +148,7 @@ def __repr__(self):
         return f"<{self.__class__.__name__} object at 0x{id(self):x} { {'field_name': self.field_name} }>"
 
     def __enter__(self):
-        super(GraphQLResolverTrace, self).__enter__()
+        super().__enter__()
         _ = self.product  # Cache product value
         return self
 
@@ -173,7 +173,7 @@ def finalize_data(self, *args, **kwargs):
         self._add_agent_attribute("graphql.field.returnType", self.field_return_type)
         self._add_agent_attribute("graphql.field.path", self.field_path)
 
-        return super(GraphQLResolverTrace, self).finalize_data(*args, **kwargs)
+        return super().finalize_data(*args, **kwargs)
 
     def create_node(self):
         return GraphQLResolverNode(