Revert refactor of old-style to new-style classes

As discussed in the mailing list, unfortunately this might break APIs
due to the subtle differences between new and old-style classes (see #2398).

This reverts commit d4afa1554b from PR #2179.
This commit is contained in:
Bruno Oliveira
2017-05-17 18:16:11 -03:00
parent 6f407ef308
commit d86c89e193
16 changed files with 45 additions and 51 deletions

View File

@@ -152,7 +152,7 @@ def pytest_collection_modifyitems(items, config):
items[:] = remaining
class MarkMapping(object):
class MarkMapping:
"""Provides a local mapping for markers where item access
resolves to True if the marker is present. """
def __init__(self, keywords):
@@ -166,7 +166,7 @@ class MarkMapping(object):
return name in self._mymarks
class KeywordMapping(object):
class KeywordMapping:
"""Provides a local mapping for keywords.
Given a list of names, map any substring of one of these names to True.
"""
@@ -230,7 +230,7 @@ def pytest_unconfigure(config):
MARK_GEN._config = getattr(config, '_old_mark_config', None)
class MarkGenerator(object):
class MarkGenerator:
""" Factory for :class:`MarkDecorator` objects - exposed as
a ``pytest.mark`` singleton instance. Example::
@@ -270,8 +270,7 @@ def istestfunc(func):
return hasattr(func, "__call__") and \
getattr(func, "__name__", "<lambda>") != "<lambda>"
class MarkDecorator(object):
class MarkDecorator:
""" A decorator for test functions and test classes. When applied
it will create :class:`MarkInfo` objects which may be
:ref:`retrieved by hooks as item keywords <excontrolskip>`.