floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

improve docstring, remove unused custom Exception

This commit is contained in:
holger krekel 2014-10-09 09:55:46 +02:00
parent 0253f7b8d5
commit d9858844c3
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
_pytest/core.py
View File

@ -93,7 +93,9 @@ def add_method_wrapper(cls, wrapper_func):
def wrapped_call(wrap_controller, func): def wrapped_call(wrap_controller, func):
""" Wrap calling to a function with a generator. The first yield """ Wrap calling to a function with a generator. The first yield
will trigger calling the function and receive an according CallOutcome will trigger calling the function and receive an according CallOutcome
object representing an exception or a result. object representing an exception or a result. The generator then
needs to finish (raise StopIteration) in order for the wrapped call
to complete.
""" """
try: try:
next(wrap_controller) # first yield next(wrap_controller) # first yield
@ -362,13 +364,6 @@ def importplugin(importspec):
class MultiCall: class MultiCall:
""" execute a call into multiple python functions/methods. """ """ execute a call into multiple python functions/methods. """
class WrongHookWrapper(Exception):
""" a hook wrapper does not behave correctly. """
def __init__(self, func, message):
Exception.__init__(self, func, message)
self.func = func
self.message = message
def __init__(self, methods, kwargs, firstresult=False): def __init__(self, methods, kwargs, firstresult=False):
self.methods = list(methods) self.methods = list(methods)
self.kwargs = kwargs self.kwargs = kwargs