fixed lint issues and lingering class usage

Author: Jibola

django_mongodb_backend/query.py

@@ -57,7 +57,6 @@ def __init__(self, compiler):
         # $lookup stage that encapsulates the pipeline for performing a nested
         # subquery.
         self.subquery_lookup = None
-        self.query_optimizer = QueryOptimizer()
 
     def __repr__(self):
         return f"<MongoQuery: {self.match_mql!r} ORDER {self.ordering!r}>"

django_mongodb_backend/query_conversion/query_optimizer.py

@@ -70,4 +70,4 @@ def _process_logical_conditions(logical_op, logical_conditions):
             match_conditions.append({"$match": optimized_conditions[0]})
     else:
         match_conditions.append({"$match": {logical_op: remaining_conditions}})
-    return match_conditions
+    return match_conditions

tests/expression_converter_/test_op_expressions.py

@@ -64,7 +64,6 @@ def test_conversion_various_types(self):
     def test_conversion_various_array_types(self):
         self._test_conversion_various_types(self._test_conversion_valid_array_type)
 
-    
     def test_conversion_getfield(self):
         expr = {"$eq": [{"$getField": {"input": "$item", "field": "age"}}, 10]}
         self.assertConversionEqual(expr, {"item.age": 10})
@@ -83,6 +82,7 @@ def test_conversion_nested_getfield(self):
         }
         self.assertConversionEqual(expr, {"item.shel_life.age": 10})
 
+
 class InTests(ConversionTestCase):
     def test_conversion(self):
         expr = {"$in": ["$category", ["electronics", "books", "clothing"]]}
@@ -102,6 +102,7 @@ def test_conversion_various_types(self):
         for _type, val in self.CONVERTIBLE_TYPES.items():
             with self.subTest(_type=_type, val=val):
                 self._test_conversion_valid_type(val)
+
     def test_conversion_getfield(self):
         expr = {"$in": [{"$getField": {"input": "$item", "field": "age"}}, [10]]}
         expected = {"item.age": {"$in": [10]}}
@@ -130,12 +131,14 @@ def test_conversion_dual_getfield_ineligible(self):
                         "field": "age",
                     }
                 },
-                [{
-                    "$getField": {
-                        "input": "$value",
-                        "field": "age",
+                [
+                    {
+                        "$getField": {
+                            "input": "$value",
+                            "field": "age",
+                        }
                     }
-                }],
+                ],
             ]
         }
         self.assertNotOptimizable(expr)
@@ -201,7 +204,7 @@ def test_mixed(self):
                 {"$in": ["$category", ["electronics", "books"]]},
                 {"$eq": ["$verified", True]},
                 {"$lte": ["$price", 2000]},
-                {"$eq": [{"$getField": {"input": "$root", "field": "age"}}, 10]}
+                {"$eq": [{"$getField": {"input": "$root", "field": "age"}}, 10]},
             ]
         }
         expected = {
@@ -210,7 +213,7 @@ def test_mixed(self):
                 {"category": {"$in": ["electronics", "books"]}},
                 {"verified": True},
                 {"price": {"$lte": 2000}},
-                {"root.age": 10}
+                {"root.age": 10},
             ]
         }
         self.assertConversionEqual(expr, expected)