TEST: Simplify data/environment fixtures

Author: effigies

nibabel/tests/test_data.py

@@ -19,24 +19,19 @@
 
 import pytest
 
-from .test_environment import (with_environment,
-                               DATA_KEY,
-                               USER_KEY)
+from .test_environment import with_environment, DATA_KEY, USER_KEY
 
 
-@pytest.fixture()
+@pytest.fixture
 def with_nimd_env(request, with_environment):
     DATA_FUNCS = {}
     DATA_FUNCS['home_dir_func'] = nibd.get_nipy_user_dir
     DATA_FUNCS['sys_dir_func'] = nibd.get_nipy_system_dir
     DATA_FUNCS['path_func'] = nibd.get_data_path
-
-    def teardown_data_env():
-        nibd.get_nipy_user_dir = DATA_FUNCS['home_dir_func']
-        nibd.get_nipy_system_dir = DATA_FUNCS['sys_dir_func']
-        nibd.get_data_path = DATA_FUNCS['path_func']
-
-    request.addfinalizer(teardown_data_env)
+    yield
+    nibd.get_nipy_user_dir = DATA_FUNCS['home_dir_func']
+    nibd.get_nipy_system_dir = DATA_FUNCS['sys_dir_func']
+    nibd.get_data_path = DATA_FUNCS['path_func']
 
 
 def test_datasource():

nibabel/tests/test_environment.py

@@ -14,7 +14,7 @@
 USER_KEY = 'NIPY_USER_DIR'
 
 
-@pytest.fixture()
+@pytest.fixture
 def with_environment(request):
     """Setup test environment for some functions that are tested
     in this module. In particular this functions stores attributes
@@ -24,20 +24,15 @@ def with_environment(request):
     """
     GIVEN_ENV = {}
     GIVEN_ENV['env'] = env.copy()
-
-
-    def teardown_environment():
-        """Restore things that were remembered by the setup_environment function
-        """
-        orig_env = GIVEN_ENV['env']
-        # Pull keys out into list to avoid altering dictionary during iteration,
-        # causing python 3 error
-        for key in list(env.keys()):
-            if key not in orig_env:
-                del env[key]
-        env.update(orig_env)
-
-    request.addfinalizer(teardown_environment)
+    yield
+    """Restore things that were remembered by the setup_environment function """
+    orig_env = GIVEN_ENV['env']
+    # Pull keys out into list to avoid altering dictionary during iteration,
+    # causing python 3 error
+    for key in list(env.keys()):
+        if key not in orig_env:
+            del env[key]
+    env.update(orig_env)
 
 
 def test_nipy_home():