Fix tests for zope.configuration > 4.2

The way exceptions are wrapped has changed. Now we can also get rid of renormalizing infrastructure.

CHANGES.rst

@@ -5,7 +5,7 @@
 3.0.1 (unreleased)
 ==================
 
-- Nothing changed yet.
+- Adapt tests to `zope.configuration >= 4.2`.
 
 
 3.0.0 (2017-10-18)

setup.py

@@ -82,7 +82,7 @@ def read(*rnames):
         'setuptools',
         'zope.browserpage',
         'zope.component',
-        'zope.configuration',
+        'zope.configuration >= 4.2.0',
         'zope.interface',
         'zope.pagetemplate',
         'zope.publisher',

src/z3c/template/tests.py

@@ -15,23 +15,15 @@
 """
 import doctest
 import itertools
-import re
 import unittest
 
 from zope.configuration import xmlconfig
 from zope.component import testing
-from zope.testing import renormalizing
 
 import z3c.pt
 import z3c.ptcompat
 import z3c.template.template
 
-checker = renormalizing.RENormalizing([
-    # Python 3 adds module name to exceptions;
-    # The output of this one is too complex for IGNORE_EXCEPTION_MODULE_IN_PYTHON2
-    (re.compile('zope.configuration.xmlconfig.ZopeXMLConfigurationError'),
-     'ZopeXMLConfigurationError'),
-])
 
 
 def setUp(test):
@@ -125,16 +117,14 @@ def test_suite():
             setUp=setUp, tearDown=tearDown,
             optionflags=(doctest.NORMALIZE_WHITESPACE
                          | doctest.ELLIPSIS
-                         | renormalizing.IGNORE_EXCEPTION_MODULE_IN_PYTHON2),
-            checker=checker,
+                         | doctest.IGNORE_EXCEPTION_DETAIL),
         ),
         doctest.DocFileSuite(
             'zcml.rst',
             setUp=setUp, tearDown=tearDown,
             optionflags=(doctest.NORMALIZE_WHITESPACE
                          | doctest.ELLIPSIS
-                         | renormalizing.IGNORE_EXCEPTION_MODULE_IN_PYTHON2),
-            checker=checker,
+                         | doctest.IGNORE_EXCEPTION_DETAIL),
         ),
     ) for setUp in setups)
     doctests = list(itertools.chain(*doctests))

src/z3c/template/zcml.rst

@@ -93,8 +93,8 @@ get an error:
   ... """, context=context)
   Traceback (most recent call last):
   ...
-  ZopeXMLConfigurationError: File "<string>", line 4.2-7.8
-      ConfigurationError: ('No such file', '...this_file_does_not_exist')
+  ConfigurationError: ('No such file', '...this_file_does_not_exist')
+  File "<string>", line 4.2-7.8
 
 Layout template
 ===============