[Checkins] SVN: Sandbox/ulif/z3c-testsetup/trunk/src/z3c/testsetup/doctesting.py Support ffilter_func, ufilter_func for doctests.

[Uli Fouquet]

Log message for revision 83526:
  Support ffilter_func, ufilter_func for doctests.

Changed:
  U   Sandbox/ulif/z3c-testsetup/trunk/src/z3c/testsetup/doctesting.py

-=-
Modified: Sandbox/ulif/z3c-testsetup/trunk/src/z3c/testsetup/doctesting.py
===================================================================
--- Sandbox/ulif/z3c-testsetup/trunk/src/z3c/testsetup/doctesting.py	2008-02-05 13:03:27 UTC (rev 83525)
+++ Sandbox/ulif/z3c-testsetup/trunk/src/z3c/testsetup/doctesting.py	2008-02-05 13:06:36 UTC (rev 83526)
@@ -46,6 +46,7 @@
         '^\s*:(T|t)est-(L|l)ayer:\s*(unit)\s*',
         ]
 
+    globs = dict()
 
     def tearDown(self, test):
         cleanup.cleanUp()
@@ -65,6 +66,7 @@
                 package=self.package,
                 setUp=self.setUp,
                 tearDown=self.tearDown,
+                globs=self.globs,
                 optionflags=self.optionflags,
                 **self.additional_options
                 ))
@@ -177,14 +179,14 @@
     
 
 def get_unitdoctests_suite(pkg_or_dotted_name, *args, **kwargs):
-    kws = ['uglobs', 'uoptionflags', 'usetup', 'uteardown']
+    kws = ['ufilter_func', 'uglobs', 'uoptionflags', 'usetup', 'uteardown']
     return _collect_tests(pkg_or_dotted_name, UnitDocTestSetup,
                           typespec_kws=kws, *args, **kwargs)
 
 def get_functionaldoctests_suite(pkg_or_dotted_name, *args, **kwargs):
+    kws = ['ffilter_func', 'fglobs', 'foptionflags', 'fsetup', 'fteardown']
     return _collect_tests(pkg_or_dotted_name, FunctionalDocTestSetup,
-                          ['fglobs', 'foptionflags', 'fsetup', 'fteardown'],
-                          *args, **kwargs)
+                          typespec_kws=kws, *args, **kwargs)
 
 def get_doctests_suite(pkg_or_dotted_name, *args, **kwargs):
     pkg = get_package(pkg_or_dotted_name)