#184: Remove reassignment of Python builtins

datagateway_api/common/database/helpers.py

@@ -204,7 +204,7 @@ def execute_query(self):
 
 class QueryFilterFactory(object):
     @staticmethod
-    def get_query_filter(filter):
+    def get_query_filter(request_filter):
         """
         Given a filter return a matching Query filter object
 
@@ -213,29 +213,29 @@ def get_query_filter(filter):
         be based off the abstract classes (because they're in the same file) which won't
         enable filters to be unique to the backend
 
-        :param filter: dict - The filter to create the QueryFilter for
+        :param request_filter: dict - The filter to create the QueryFilter for
         :return: The QueryFilter object created
         """
-        filter_name = list(filter)[0].lower()
+        filter_name = list(request_filter)[0].lower()
         if filter_name == "where":
-            field = list(filter[filter_name].keys())[0]
-            operation = list(filter[filter_name][field].keys())[0]
-            value = filter[filter_name][field][operation]
+            field = list(request_filter[filter_name].keys())[0]
+            operation = list(request_filter[filter_name][field].keys())[0]
+            value = request_filter[filter_name][field][operation]
             return WhereFilter(field, value, operation)
         elif filter_name == "order":
-            field = filter["order"].split(" ")[0]
-            direction = filter["order"].split(" ")[1]
+            field = request_filter["order"].split(" ")[0]
+            direction = request_filter["order"].split(" ")[1]
             return OrderFilter(field, direction)
         elif filter_name == "skip":
-            return SkipFilter(filter["skip"])
+            return SkipFilter(request_filter["skip"])
         elif filter_name == "limit":
-            return LimitFilter(filter["limit"])
+            return LimitFilter(request_filter["limit"])
         elif filter_name == "include":
-            return IncludeFilter(filter["include"])
+            return IncludeFilter(request_filter["include"])
         elif filter_name == "distinct":
-            return DistinctFieldFilter(filter["distinct"])
+            return DistinctFieldFilter(request_filter["distinct"])
         else:
-            raise FilterError(f" Bad filter: {filter}")
+            raise FilterError(f" Bad filter: {request_filter}")
 
 
 def insert_row_into_table(table, row):

datagateway_api/common/filter_order_handler.py

@@ -18,14 +18,14 @@ class FilterOrderHandler(object):
     def __init__(self):
         self.filters = []
 
-    def add_filter(self, filter):
-        self.filters.append(filter)
+    def add_filter(self, query_filter):
+        self.filters.append(query_filter)
 
-    def add_filters(self, filters):
-        self.filters.extend(filters)
+    def add_filters(self, query_filter):
+        self.filters.extend(query_filter)
 
-    def remove_filter(self, filter):
-        self.filters.remove(filter)
+    def remove_filter(self, query_filter):
+        self.filters.remove(query_filter)
 
     def sort_filters(self):
         """
@@ -41,8 +41,8 @@ def apply_filters(self, query):
         """
         self.sort_filters()
 
-        for filter in self.filters:
-            filter.apply_filter(query)
+        for query_filter in self.filters:
+            query_filter.apply_filter(query)
 
     def merge_python_icat_limit_skip_filters(self):
         """

noxfile.py

@@ -21,7 +21,7 @@ def install_with_constraints(session, *args, **kwargs):
 
 
 @nox.session(python="3.6", reuse_venv=True)
-def format(session):
+def black(session):
     args = session.posargs or code_locations
     install_with_constraints(session, "black")
     session.run("black", *args, external=True)