[Zope3-checkins] SVN: Zope3/trunk/src/zope/app/testing/functional.py Restore the chunk that was accidentally lost during the service branch merge.

[Marius Gedminas]

Log message for revision 29151:
  Restore the chunk that was accidentally lost during the service branch merge.
  
  

Changed:
  U   Zope3/trunk/src/zope/app/testing/functional.py

-=-
Modified: Zope3/trunk/src/zope/app/testing/functional.py
===================================================================
--- Zope3/trunk/src/zope/app/testing/functional.py	2005-02-15 18:19:26 UTC (rev 29150)
+++ Zope3/trunk/src/zope/app/testing/functional.py	2005-02-15 22:00:45 UTC (rev 29151)
@@ -646,7 +646,10 @@
         FunctionalTestSetup().tearDown()
     kw['tearDown'] = tearDown
 
-    kw['optionflags'] = doctest.ELLIPSIS | doctest.REPORT_NDIFF
+    if 'optionflags' not in kw:
+        kw['optionflags'] = (doctest.ELLIPSIS
+                             | doctest.REPORT_NDIFF
+                             | doctest.NORMALIZE_WHITESPACE)
 
     return doctest.DocFileSuite(*paths, **kw)