Update test_queries.py

Remove Python 2 support and use SimpleNamespace
rhomboss · Apr 24, 2024 · 6bdb2cc · 6bdb2cc
1 parent 2fcbc05
commit 6bdb2cc
Showing 1 changed file with 11 additions and 9 deletions.
diff --git a/tests/testapp/test_queries.py b/tests/testapp/test_queries.py
@@ -25,11 +25,13 @@
 from tree_queries.compiler import SEPARATOR, TreeQuery
 from tree_queries.query import pk
 
+from types import SimpleNamespace
+
 
 @override_settings(DEBUG=True)
 class Test(TestCase):
     def create_tree(self):
-        tree = type("Namespace", (), {})()  # SimpleNamespace for PY2...
+        tree = SimpleNamespace()
         tree.root = Model.objects.create(name="root")
         tree.child1 = Model.objects.create(parent=tree.root, order=0, name="1")
         tree.child2 = Model.objects.create(parent=tree.root, order=1, name="2")
@@ -257,7 +259,7 @@ class OtherForm(forms.Form):
         self.assertNotIn("root", html)
 
     def test_string_ordering(self):
-        tree = type("Namespace", (), {})()  # SimpleNamespace for PY2...
+        tree = SimpleNamespace()
 
         tree.americas = StringOrderedModel.objects.create(name="Americas")
         tree.europe = StringOrderedModel.objects.create(name="Europe")
@@ -373,7 +375,7 @@ def test_always_tree_query_relations(self):
     def test_reference(self):
         tree = self.create_tree()
 
-        references = type("Namespace", (), {})()  # SimpleNamespace for PY2...
+        references = SimpleNamespace()
         references.none = ReferenceModel.objects.create(position=0)
         references.root = ReferenceModel.objects.create(
             position=1, tree_field=tree.root
@@ -534,7 +536,7 @@ def test_uuid_queries(self):
         )
 
     def test_sibling_ordering(self):
-        tree = type("Namespace", (), {})()  # SimpleNamespace for PY2...
+        tree = SimpleNamespace()
 
         tree.root = MultiOrderedModel.objects.create(name="root")
         tree.child1 = MultiOrderedModel.objects.create(
@@ -682,7 +684,7 @@ def test_descending_order(self):
         )
 
     def test_multi_field_order(self):
-        tree = type("Namespace", (), {})()  # SimpleNamespace for PY2...
+        tree = SimpleNamespace()
 
         tree.root = MultiOrderedModel.objects.create(name="root")
         tree.child1 = MultiOrderedModel.objects.create(
@@ -717,7 +719,7 @@ def test_multi_field_order(self):
         )
 
     def test_order_by_related(self):
-        tree = type("Namespace", (), {})()  # SimpleNamespace for PY2...
+        tree = SimpleNamespace()
 
         tree.root = RelatedOrderModel.objects.create(name="root")
         tree.child1 = RelatedOrderModel.objects.create(parent=tree.root, name="1")
@@ -798,7 +800,7 @@ def test_tree_filter_chaining(self):
         )
 
     def test_tree_filter_related(self):
-        tree = type("Namespace", (), {})()  # SimpleNamespace for PY2...
+        tree = SimpleNamespace()
 
         tree.root = RelatedOrderModel.objects.create(name="root")
         tree.root_related = OneToOneRelatedOrder.objects.create(
@@ -836,7 +838,7 @@ def test_tree_filter_related(self):
         )
 
     def test_tree_filter_with_order(self):
-        tree = type("Namespace", (), {})()  # SimpleNamespace for PY2...
+        tree = SimpleNamespace()
 
         tree.root = MultiOrderedModel.objects.create(
             name="root", first_position=1,
@@ -888,7 +890,7 @@ def test_tree_filter_Q_objects(self):
         )
 
     def test_tree_filter_Q_mix(self):
-        tree = type("Namespace", (), {})()  # SimpleNamespace for PY2...
+        tree = SimpleNamespace()
 
         tree.root = MultiOrderedModel.objects.create(
             name="root", first_position=1, second_position=2