jiuyuan
/
test_ok1
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert subclassing explicitly from object introduced by accident in #2260

This commit is contained in:
Bruno Oliveira 2017-02-18 10:34:41 -02:00
parent abd6ad3751
commit f1900bbea6
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
_pytest/vendored_packages/pluggy.py
View File

@ -75,7 +75,7 @@ __all__ = ["PluginManager", "PluginValidationError", "HookCallError",
_py3 = sys.version_info > (3, 0) _py3 = sys.version_info > (3, 0)
class HookspecMarker(object): class HookspecMarker:
""" Decorator helper class for marking functions as hook specifications. """ Decorator helper class for marking functions as hook specifications.
You can instantiate it with a project_name to get a decorator. You can instantiate it with a project_name to get a decorator.
@ -113,7 +113,7 @@ class HookspecMarker(object):
return setattr_hookspec_opts return setattr_hookspec_opts
class HookimplMarker(object): class HookimplMarker:
""" Decorator helper class for marking functions as hook implementations. """ Decorator helper class for marking functions as hook implementations.
You can instantiate with a project_name to get a decorator. You can instantiate with a project_name to get a decorator.
@ -167,7 +167,7 @@ def normalize_hookimpl_opts(opts):
opts.setdefault("optionalhook", False) opts.setdefault("optionalhook", False)
class _TagTracer(object): class _TagTracer:
def __init__(self): def __init__(self):
self._tag2proc = {} self._tag2proc = {}
self.writer = None self.writer = None
@ -214,7 +214,7 @@ class _TagTracer(object):
self._tag2proc[tags] = processor self._tag2proc[tags] = processor
class _TagTracerSub(object): class _TagTracerSub:
def __init__(self, root, tags): def __init__(self, root, tags):
self.root = root self.root = root
self.tags = tags self.tags = tags
@ -254,7 +254,7 @@ def _wrapped_call(wrap_controller, func):
return call_outcome.get_result() return call_outcome.get_result()
class _CallOutcome(object): class _CallOutcome:
""" Outcome of a function call, either an exception or a proper result. """ Outcome of a function call, either an exception or a proper result.
Calling the ``get_result`` method will return the result or reraise Calling the ``get_result`` method will return the result or reraise
the exception raised when the function was called. """ the exception raised when the function was called. """
@ -286,7 +286,7 @@ def _reraise(cls, val, tb):
""") """)
class _TracedHookExecution(object): class _TracedHookExecution:
def __init__(self, pluginmanager, before, after): def __init__(self, pluginmanager, before, after):
self.pluginmanager = pluginmanager self.pluginmanager = pluginmanager
self.before = before self.before = before
@ -580,7 +580,7 @@ class PluginManager(object):
return orig return orig
class _MultiCall(object): class _MultiCall:
""" execute a call into multiple python functions/methods. """ """ execute a call into multiple python functions/methods. """
# XXX note that the __multicall__ argument is supported only # XXX note that the __multicall__ argument is supported only
@ -673,7 +673,7 @@ def varnames(func, startindex=None):
return x return x
class _HookRelay(object): class _HookRelay:
""" hook holder object for performing 1:N hook calls where N is the number """ hook holder object for performing 1:N hook calls where N is the number
of registered plugins. of registered plugins.
@ -770,7 +770,7 @@ class _HookCaller(object):
proc(res[0]) proc(res[0])
class HookImpl(object): class HookImpl:
def __init__(self, plugin, plugin_name, function, hook_impl_opts): def __init__(self, plugin, plugin_name, function, hook_impl_opts):
self.function = function self.function = function
self.argnames = varnames(self.function) self.argnames = varnames(self.function)