[Checkins] SVN: z3c.form/trunk/src/z3c/form/ Make the two testing versions work for me. Just checking for

[Stephan Richter]

Log message for revision 100927:
  Make the two testing versions work for me. Just checking for 
  z3c.ptcomat does not mean z3c.pt is available.
  

Changed:
  U   z3c.form/trunk/src/z3c/form/browser/tests.py
  U   z3c.form/trunk/src/z3c/form/ptcompat.py
  U   z3c.form/trunk/src/z3c/form/tests/test_doc.py

-=-
Modified: z3c.form/trunk/src/z3c/form/browser/tests.py
===================================================================
--- z3c.form/trunk/src/z3c/form/browser/tests.py	2009-06-14 02:11:49 UTC (rev 100926)
+++ z3c.form/trunk/src/z3c/form/browser/tests.py	2009-06-14 02:14:27 UTC (rev 100927)
@@ -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,)

Modified: z3c.form/trunk/src/z3c/form/ptcompat.py
===================================================================
--- z3c.form/trunk/src/z3c/form/ptcompat.py	2009-06-14 02:11:49 UTC (rev 100926)
+++ z3c.form/trunk/src/z3c/form/ptcompat.py	2009-06-14 02:14:27 UTC (rev 100927)
@@ -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

Modified: z3c.form/trunk/src/z3c/form/tests/test_doc.py
===================================================================
--- z3c.form/trunk/src/z3c/form/tests/test_doc.py	2009-06-14 02:11:49 UTC (rev 100926)
+++ z3c.form/trunk/src/z3c/form/tests/test_doc.py	2009-06-14 02:14:27 UTC (rev 100927)
@@ -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,)