Make the two testing versions work for me. Just checking for

z3c.ptcomat does not mean z3c.pt is available.
zopefoundation · Jun 14, 2009 · b04347b · b04347b
1 parent 39ff167
commit b04347b
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/src/z3c/form/browser/tests.py b/src/z3c/form/browser/tests.py
@@ -23,12 +23,12 @@
 from zope.testing.doctestunit import DocFileSuite
 
 from z3c.form import testing
-from z3c.form.ptcompat import AVAILABLE
+from z3c.form.ptcompat import AVAILABLE, Z3CPT_AVAILABLE
 
 def test_suite():
     checker = testing.OutputChecker(doctest)
 
-    if AVAILABLE:
+    if AVAILABLE and Z3CPT_AVAILABLE:
         setups = (testing.setUpZPT, testing.setUpZ3CPT)
     else:
         setups = (testing.setUpZPT,)

diff --git a/src/z3c/form/ptcompat.py b/src/z3c/form/ptcompat.py
@@ -19,12 +19,20 @@
 
 #import utilities from z3c.ptcompat when available and set AVAILABLE flag
 
+AVAILABLE = False
+Z3CPT_AVAILABLE = False
+
 try:
     from z3c.ptcompat import ViewPageTemplateFile
     from z3c.ptcompat import bind_template
     AVAILABLE = True
 except ImportError:
-    AVAILABLE = False
     from zope.app.pagetemplate.viewpagetemplatefile import ViewPageTemplateFile
     from zope.app.pagetemplate.viewpagetemplatefile import BoundPageTemplate \
          as bind_template
+
+try:
+    import z3c.pt
+    Z3CPT_AVAILABLE = True
+except ImportError:
+    pass
diff --git a/src/z3c/form/tests/test_doc.py b/src/z3c/form/tests/test_doc.py
@@ -24,12 +24,12 @@
 from zope.app.testing import placelesssetup
 
 from z3c.form import testing
-from z3c.form.ptcompat import AVAILABLE
+from z3c.form.ptcompat import AVAILABLE, Z3CPT_AVAILABLE
 
 def test_suite():
     checker = testing.OutputChecker(doctest)
 
-    if AVAILABLE:
+    if AVAILABLE and Z3CPT_AVAILABLE:
         setups = (testing.setUpZPT, testing.setUpZ3CPT)
     else:
         setups = (testing.setUpZPT,)