Merge pull request #1353 from newrelic/fix-linter-flake8-comprehensions

Enable flake8-comprehensions

Author: hmstepanek

newrelic/admin/validate_config.py

@@ -187,7 +187,7 @@ def validate_config(args):
     _settings.debug.log_data_collector_payloads = True
     _settings.debug.log_transaction_trace_payload = True
 
-    print(_user_message % dict(app_name=app_name, log_file=log_file))
+    print(_user_message % {"app_name": app_name, "log_file": log_file})
 
     _logger.debug("Register test application.")
 

newrelic/api/database_trace.py

@@ -90,7 +90,7 @@ def __enter__(self):
         return result
 
     def __repr__(self):
-        return f"<{self.__class__.__name__} object at 0x{id(self):x} {dict(sql=self.sql, dbapi2_module=self.dbapi2_module)}>"
+        return f"<{self.__class__.__name__} object at 0x{id(self):x} { {'sql': self.sql, 'dbapi2_module': self.dbapi2_module} }>"
 
     @property
     def is_async_mode(self):

newrelic/api/datastore_trace.py

@@ -92,7 +92,7 @@ def __enter__(self):
         return result
 
     def __repr__(self):
-        return f"<{self.__class__.__name__} object at 0x{id(self):x} {dict(product=self.product, target=self.target, operation=self.operation, host=self.host, port_path_or_id=self.port_path_or_id, database_name=self.database_name)}>"
+        return f"<{self.__class__.__name__} object at 0x{id(self):x} { {'product': self.product, 'target': self.target, 'operation': self.operation, 'host': self.host, 'port_path_or_id': self.port_path_or_id, 'database_name': self.database_name} }>"
 
     def finalize_data(self, transaction, exc=None, value=None, tb=None):
         if not self.instance_reporting_enabled:

newrelic/api/external_trace.py

@@ -36,7 +36,7 @@ def __init__(self, library, url, method=None, **kwargs):
         self.params = {}
 
     def __repr__(self):
-        return f"<{self.__class__.__name__} object at 0x{id(self):x} {dict(library=self.library, url=self.url, method=self.method)}>"
+        return f"<{self.__class__.__name__} object at 0x{id(self):x} { {'library': self.library, 'url': self.url, 'method': self.method} }>"
 
     def process_response(self, status_code, headers):
         self._add_agent_attribute("http.statusCode", status_code)

newrelic/api/function_trace.py

@@ -55,7 +55,7 @@ def __enter__(self):
         return result
 
     def __repr__(self):
-        return f"<{self.__class__.__name__} object at 0x{id(self):x} {dict(name=self.name, group=self.group, label=self.label, params=self.params, terminal=self.terminal, rollup=self.rollup)}>"
+        return f"<{self.__class__.__name__} object at 0x{id(self):x} { {'name': self.name, 'group': self.group, 'label': self.label, 'params': self.params, 'terminal': self.terminal, 'rollup': self.rollup} }>"
 
     def terminal_node(self):
         return self.terminal

newrelic/api/graphql_trace.py

@@ -39,7 +39,7 @@ def __init__(self, **kwargs):
         self.product = "GraphQL"
 
     def __repr__(self):
-        return f"<{self.__class__.__name__} object at 0x{id(self):x} {dict(operation_name=self.operation_name, operation_type=self.operation_type, deepest_path=self.deepest_path, graphql=self.graphql)}>"
+        return f"<{self.__class__.__name__} object at 0x{id(self):x} { {'operation_name': self.operation_name, 'operation_type': self.operation_type, 'deepest_path': self.deepest_path, 'graphql': self.graphql} }>"
 
     @property
     def formatted(self):
@@ -145,7 +145,7 @@ def __init__(self, field_name=None, field_parent_type=None, field_return_type=No
         self._product = None
 
     def __repr__(self):
-        return f"<{self.__class__.__name__} object at 0x{id(self):x} {dict(field_name=self.field_name)}>"
+        return f"<{self.__class__.__name__} object at 0x{id(self):x} { {'field_name': self.field_name} }>"
 
     def __enter__(self):
         super(GraphQLResolverTrace, self).__enter__()

newrelic/api/log.py

@@ -131,7 +131,7 @@ def format(self, record):
 
 
 class NewRelicLogForwardingHandler(logging.Handler):
-    IGNORED_LOG_RECORD_KEYS = set(["message", "msg"])
+    IGNORED_LOG_RECORD_KEYS = {"message", "msg"}
 
     def emit(self, record):
         try:

newrelic/api/memcache_trace.py

@@ -32,7 +32,7 @@ def __init__(self, command, **kwargs):
         self.command = command
 
     def __repr__(self):
-        return f"<{self.__class__.__name__} object at 0x{id(self):x} {dict(command=self.command)}>"
+        return f"<{self.__class__.__name__} object at 0x{id(self):x} { {'command': self.command} }>"
 
     def terminal_node(self):
         return True

newrelic/api/message_trace.py

@@ -64,7 +64,7 @@ def __enter__(self):
         return result
 
     def __repr__(self):
-        return f"<{self.__class__.__name__} object at 0x{id(self):x} {dict(library=self.library, operation=self.operation)}>"
+        return f"<{self.__class__.__name__} object at 0x{id(self):x} { {'library': self.library, 'operation': self.operation} }>"
 
     def terminal_node(self):
         return self.terminal

newrelic/api/solr_trace.py

@@ -31,9 +31,7 @@ def __init__(self, library, command, **kwargs):
         self.command = command
 
     def __repr__(self):
-        return (
-            f"<{self.__class__.__name__} object at 0x{id(self):x} {dict(library=self.library, command=self.command)}>"
-        )
+        return f"<{self.__class__.__name__} object at 0x{id(self):x} { {'library': self.library, 'command': self.command} }>"
 
     def terminal_node(self):
         return True