[Checkins] SVN: plone.z3cform/trunk/plone/z3cform/tests.py Remove zope 2.10 compat code

Hano Schlichting cvs-admin at zope.org
Sat May 19 20:26:17 UTC 2012


Log message for revision 126393:
  Remove zope 2.10 compat code
  

Changed:
  U   plone.z3cform/trunk/plone/z3cform/tests.py

-=-
Modified: plone.z3cform/trunk/plone/z3cform/tests.py
===================================================================
--- plone.z3cform/trunk/plone/z3cform/tests.py	2012-05-19 16:35:03 UTC (rev 126392)
+++ plone.z3cform/trunk/plone/z3cform/tests.py	2012-05-19 20:26:13 UTC (rev 126393)
@@ -61,6 +61,7 @@
 testing_zcml_layer = ZCMLLayer(
     testing_zcml_path, 'plone.z3cform', 'testing_zcml_layer')
 
+
 def test_suite():
     layout_txt = doctest.DocFileSuite('layout.txt')
     layout_txt.layer = testing_zcml_layer
@@ -71,18 +72,8 @@
     fieldsets_txt = doctest.DocFileSuite('fieldsets/README.txt')
     fieldsets_txt.layer = testing_zcml_layer
 
-    if sys.version_info[:2] > (2, 4):
-        # Zope 2.10 raises TraversalError instead of LocationError
-        traversal_txt = doctest.DocFileSuite('traversal.txt')
-        traversal_txt.layer = testing_zcml_layer
-    else:
-        import tempfile
-        tmp = tempfile.NamedTemporaryFile()
-        test = open(os.path.join(os.path.dirname(__file__), 'traversal.txt')).read()
-        tmp.write(test.replace('LocationError', 'TraversalError'))
-        tmp.flush()
-        traversal_txt = doctest.DocFileSuite(tmp.name, module_relative=False)
-        traversal_txt.layer = testing_zcml_layer
+    traversal_txt = doctest.DocFileSuite('traversal.txt')
+    traversal_txt.layer = testing_zcml_layer
 
     return unittest.TestSuite([
         layout_txt, inputs_txt, fieldsets_txt, traversal_txt,



More information about the checkins mailing list