[Checkins] SVN: Sandbox/ulif/z3c-testsetup/trunk/src/z3c/testsetup/ Support for fextensions/uextensions keywords.

[Uli Fouquet]

Log message for revision 83536:
  Support for fextensions/uextensions keywords.

Changed:
  U   Sandbox/ulif/z3c-testsetup/trunk/src/z3c/testsetup/doctesting.py
  U   Sandbox/ulif/z3c-testsetup/trunk/src/z3c/testsetup/testing.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 15:26:24 UTC (rev 83535)
+++ Sandbox/ulif/z3c-testsetup/trunk/src/z3c/testsetup/doctesting.py	2008-02-05 15:26:58 UTC (rev 83536)
@@ -179,12 +179,14 @@
     
 
 def get_unitdoctests_suite(pkg_or_dotted_name, *args, **kwargs):
-    kws = ['ufilter_func', 'uglobs', 'uoptionflags', 'usetup', 'uteardown']
+    kws = ['ufilter_func', 'uextensions',
+           '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']
+    kws = ['ffilter_func', 'fextensions',
+           'fglobs', 'foptionflags', 'fsetup', 'fteardown']
     return _collect_tests(pkg_or_dotted_name, FunctionalDocTestSetup,
                           typespec_kws=kws, *args, **kwargs)
 

Modified: Sandbox/ulif/z3c-testsetup/trunk/src/z3c/testsetup/testing.py
===================================================================
--- Sandbox/ulif/z3c-testsetup/trunk/src/z3c/testsetup/testing.py	2008-02-05 15:26:24 UTC (rev 83535)
+++ Sandbox/ulif/z3c-testsetup/trunk/src/z3c/testsetup/testing.py	2008-02-05 15:26:58 UTC (rev 83536)
@@ -103,8 +103,9 @@
 def get_pytests_suite(pkg_or_dotted_name, *args, **kwargs):
     kws = ['pfilter_func',]
     options = kwargs.copy()
-    if 'filter_func' in kwargs.keys():
-        del(options['filter_func'])
+    for optname in ['filter_func', 'extensions']:
+        if optname in kwargs.keys():
+            del (options[optname])
     return _collect_tests(pkg_or_dotted_name, UnitTestSetup,
                           typespec_kws=kws, *args, **options)