Merge branch 'python-control:main' into feature_print_zpk

henklaak · web-flow · commit 5f506b26c6da · 2023-03-05T13:28:53.000+01:00
diff --git a/control/tests/conftest.py b/control/tests/conftest.py
@@ -101,7 +101,8 @@ def editsdefaults():
     """Make sure any changes to the defaults only last during a test."""
     restore = control.config.defaults.copy()
     yield
-    control.config.defaults = restore.copy()
+    control.config.defaults.clear()
+    control.config.defaults.update(restore)
 
 
 @pytest.fixture(scope="function")
