diff options
Diffstat (limited to 'lib/spack/external/pytest-fallback/_pytest/fixtures.py')
| -rw-r--r-- | lib/spack/external/pytest-fallback/_pytest/fixtures.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/spack/external/pytest-fallback/_pytest/fixtures.py b/lib/spack/external/pytest-fallback/_pytest/fixtures.py index 98317a4889..7ad495615e 100644 --- a/lib/spack/external/pytest-fallback/_pytest/fixtures.py +++ b/lib/spack/external/pytest-fallback/_pytest/fixtures.py @@ -1,5 +1,6 @@ from __future__ import absolute_import, division, print_function +import collections import inspect import sys import warnings @@ -21,9 +22,6 @@ from _pytest.compat import ( from _pytest.outcomes import fail, TEST_OUTCOME -from ordereddict_backport import OrderedDict - - def pytest_sessionstart(session): import _pytest.python scopename2class.update({ @@ -165,7 +163,7 @@ def reorder_items(items): for scopenum in range(0, scopenum_function): argkeys_cache[scopenum] = d = {} for item in items: - keys = OrderedDict.fromkeys(get_parametrized_fixture_keys(item, scopenum)) + keys = collections.OrderedDict.fromkeys(get_parametrized_fixture_keys(item, scopenum)) if keys: d[item] = keys return reorder_items_atscope(items, set(), argkeys_cache, 0) @@ -200,7 +198,7 @@ def slice_items(items, ignore, scoped_argkeys_cache): for i, item in enumerate(it): argkeys = scoped_argkeys_cache.get(item) if argkeys is not None: - newargkeys = OrderedDict.fromkeys(k for k in argkeys if k not in ignore) + newargkeys = collections.OrderedDict.fromkeys(k for k in argkeys if k not in ignore) if newargkeys: # found a slicing key slicing_argkey, _ = newargkeys.popitem() items_before = items[:i] |