Merge branch 'master' into fixture_order

Author: altendky

pytest_twisted.py

@@ -128,7 +128,7 @@ def repr_args_kwargs(*args, **kwargs):
     return '({})'.format(arguments)
 
 
-def positional_not_allowed_exception(*args, **kwargs):
+def _positional_not_allowed_exception(*args, **kwargs):
     arguments = repr_args_kwargs(*args, **kwargs)
 
     return DecoratorArgumentsError(
@@ -142,13 +142,13 @@ def decorator_decorator(d):
         def decorator_wrapper(*args, **decorator_arguments):
             """this is decorator_wrapper"""
             if len(args) > 1:
-                raise positional_not_allowed_exception()
+                raise _positional_not_allowed_exception()
 
             if len(args) == 1:
                 maybe_f = args[0]
 
                 if len(decorator_arguments) > 0 or not callable(maybe_f):
-                    raise positional_not_allowed_exception()
+                    raise _positional_not_allowed_exception()
 
                 f = maybe_f
                 return d(f)
@@ -318,7 +318,7 @@ def _async_pytest_fixture_setup(fixturedef, request, mark):
 
 
 @defer.inlineCallbacks
-def tear_it_down(deferred):
+def _tear_it_down(deferred):
     """Tear down a specific async yield fixture."""
     try:
         yield deferred