Fixing latest pytest compatibility

Author: olegpidsadnyi

pytest_bdd/scenario.py

@@ -16,7 +16,10 @@
 import re
 
 import pytest
-from _pytest import python
+try:
+    from _pytest import fixtures as pytest_fixtures
+except ImportError:
+    from _pytest import python as pytest_fixtures
 import six
 
 from . import exceptions
@@ -69,7 +72,7 @@ def find_argumented_step_fixture_name(name, type_, fixturemanager, request=None)
                 if request:
                     try:
                         request.getfuncargvalue(parser_name)
-                    except python.FixtureLookupError:
+                    except pytest_fixtures.FixtureLookupError:
                         continue
                 return parser_name
 
@@ -87,13 +90,13 @@ def _find_step_function(request, step, scenario, encoding):
     name = step.name
     try:
         return request.getfuncargvalue(get_step_fixture_name(name, step.type, encoding))
-    except python.FixtureLookupError:
+    except pytest_fixtures.FixtureLookupError:
         try:
             name = find_argumented_step_fixture_name(name, step.type, request._fixturemanager, request)
             if name:
                 return request.getfuncargvalue(name)
             raise
-        except python.FixtureLookupError:
+        except pytest_fixtures.FixtureLookupError:
             raise exceptions.StepDefinitionNotFoundError(
                 u"""Step definition is not found: {step}."""
                 """ Line {step.line_number} in scenario "{scenario.name}" in the feature "{feature.filename}""".format(
@@ -234,7 +237,7 @@ def _get_scenario_decorator(feature, feature_name, scenario, scenario_name, call
     scenario_name = force_encode(scenario_name, encoding)
 
     def decorator(_pytestbdd_function):
-        if isinstance(_pytestbdd_function, python.FixtureRequest):
+        if isinstance(_pytestbdd_function, pytest_fixtures.FixtureRequest):
             raise exceptions.ScenarioIsDecoratorOnly(
                 "scenario function can only be used as a decorator. Refer to the documentation.",
             )

pytest_bdd/steps.py

@@ -37,7 +37,10 @@ def article(author):
 import sys
 
 import pytest
-from _pytest import python
+try:
+    from _pytest import fixtures as pytest_fixtures
+except ImportError:
+    from _pytest import python as pytest_fixtures
 import six
 
 from .feature import parse_line, force_encode
@@ -293,10 +296,10 @@ def inject_fixture(request, arg, value):
         'params': None,
     }
 
-    if 'yieldctx' in get_args(python.FixtureDef.__init__):
+    if 'yieldctx' in get_args(pytest_fixtures.FixtureDef.__init__):
         fd_kwargs['yieldctx'] = False
 
-    fd = python.FixtureDef(**fd_kwargs)
+    fd = pytest_fixtures.FixtureDef(**fd_kwargs)
     fd.cached_result = (value, 0, None)
 
     old_fd = getattr(request, "_fixturedefs", {}).get(arg)