Make setup_module() work without a module passed in

1 files changed, 6 insertions, 1 deletions

diff --git a/paste/tests/fixture.py b/paste/tests/fixture.py
index 53dbfbb..4a1a16a 100644
--- a/paste/tests/fixture.py
+++ b/paste/tests/fixture.py
@@ -558,7 +558,7 @@ class TestRequest(object):
             self.full_url = url
 
 
-def setup_module(module):
+def setup_module(module=None):
     """
     This is used by py.test if it is in the module, so do::
 
@@ -568,6 +568,11 @@ def setup_module(module):
     module.  If there is a function ``reset_state`` in your module
     then that is also called.
     """
+    if module is None:
+        # The module we were called from must be the module...
+        module = sys._getframe().f_back.f_globals['__name__']
+    if isinstance(module, (str, unicode)):
+        module = sys.modules[module]
     try:
         CONFIG.current_config()
     except AttributeError: