[Checkins] SVN: z3c.recipe.compattest/trunk/src/z3c/recipe/compattest/testing.py Fix tests on windows.

[Jan-Jaap Driessen]

Log message for revision 118967:
  Fix tests on windows.

Changed:
  U   z3c.recipe.compattest/trunk/src/z3c/recipe/compattest/testing.py

-=-
Modified: z3c.recipe.compattest/trunk/src/z3c/recipe/compattest/testing.py
===================================================================
--- z3c.recipe.compattest/trunk/src/z3c/recipe/compattest/testing.py	2010-12-16 18:53:45 UTC (rev 118966)
+++ z3c.recipe.compattest/trunk/src/z3c/recipe/compattest/testing.py	2010-12-16 18:55:49 UTC (rev 118967)
@@ -4,9 +4,8 @@
 from zope.testing import renormalizing
 
 
-normalize_script = (
-    re.compile('(\n?)-  ([a-zA-Z0-9_.-]+)-script.py\n-  \\2.exe\n'),
-    '\\1-  \\2\n')
+normalize_script = (re.compile('(-  [a-zA-Z0-9_.-]+)-script.py\n'), '\\1\n')
+normalize_exe = (re.compile('-  [a-zA-Z0-9_.-]+.exe\n'), '')
 
 # Distribute does not result in a setuptools compattest binary, so filter
 # that out.
@@ -18,6 +17,7 @@
 # capital 'P'. On linux it does not.
 python_case_normalizer = (re.compile('[pP]ython'), 'python')
 
+
 def DocFileSuite(*args, **kw):
     def setUp(test):
         zc.buildout.testing.buildoutSetUp(test)
@@ -44,6 +44,7 @@
     kw['checker'] = renormalizing.RENormalizing([
         zc.buildout.testing.normalize_path,
         normalize_script,
+        normalize_exe,
         normalize_setuptools,
         python_case_normalizer,
         ])