diff --git a/_pytest/mark.py b/_pytest/mark.py index b49f0fc64..3cac9dc91 100644 --- a/_pytest/mark.py +++ b/_pytest/mark.py @@ -75,7 +75,7 @@ class ParameterSet(namedtuple('ParameterSet', 'values, marks, id')): return cls(argval, marks=newmarks, id=None) @classmethod - def _for_parameterize(cls, argnames, argvalues, function, config): + def _for_parametrize(cls, argnames, argvalues, function, config): if not isinstance(argnames, (tuple, list)): argnames = [x.strip() for x in argnames.split(",") if x.strip()] force_tuple = len(argnames) == 1 diff --git a/_pytest/python.py b/_pytest/python.py index 2a84677ec..fb7bac8b8 100644 --- a/_pytest/python.py +++ b/_pytest/python.py @@ -785,7 +785,8 @@ class Metafunc(fixtures.FuncargnamesCompatAttr): from _pytest.fixtures import scope2index from _pytest.mark import ParameterSet from py.io import saferepr - argnames, parameters = ParameterSet._for_parameterize( + + argnames, parameters = ParameterSet._for_parametrize( argnames, argvalues, self.function, self.config) del argvalues diff --git a/changelog/3166.trivial b/changelog/3166.trivial new file mode 100644 index 000000000..ce92840cb --- /dev/null +++ b/changelog/3166.trivial @@ -0,0 +1 @@ +Rename ``ParameterSet._for_parameterize()`` to ``_for_parametrize()`` in order to comply with the naming convention.