raises error on nested override site

stephenmcd · Jun 12, 2024 · fe73b85 · fe73b85
1 parent e719286
commit fe73b85
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/mezzanine/utils/sites.py b/mezzanine/utils/sites.py
@@ -72,6 +72,8 @@ def override_current_site_id(site_id):
     Context manager that overrides the current site id for code executed
     within it. Used to access SiteRelated objects outside the current site.
     """
+    if hasattr(override_current_site_id.thread_local,'site_id'):
+        raise RecursionError(f'''override_current_site_id can't be nested''')
     override_current_site_id.thread_local.site_id = site_id
     try:
         yield

diff --git a/tests/test_core.py b/tests/test_core.py
@@ -598,6 +598,16 @@ def test_override_site_id(self):
             self.assertEqual(current_site_id(), 2)
         self.assertEqual(current_site_id(), 1)
 
+    def test_nested_override_site_id(self):
+        self.assertEqual(current_site_id(), 1)
+        with override_current_site_id(2):
+            self.assertEqual(current_site_id(), 2)
+            with self.assertRaises(RecursionError):
+                with override_current_site_id(3):
+                    self.assertEqual(current_site_id(), 3)
+                self.assertEqual(current_site_id(), 2)
+        self.assertEqual(current_site_id(), 1)
+
 
 class CSRFTestViews:
     def nevercache_view(request):