[Checkins] SVN: z3c.macro/trunk/ - Tests now require ``zope.browserpage >= 3.12`` instead of

[Michael Howitz]

Log message for revision 114189:
  - Tests now require ``zope.browserpage >= 3.12`` instead of
    ``zope.app.pagetemplate`` as the expression type registration has
    been moved there recently.
  
  - No longer using deprecated ``zope.testing.doctestunit`` but built-in
    ``doctest`` instead.
  
  

Changed:
  U   z3c.macro/trunk/CHANGES.txt
  U   z3c.macro/trunk/setup.py
  U   z3c.macro/trunk/src/z3c/macro/tests.py

-=-
Modified: z3c.macro/trunk/CHANGES.txt
===================================================================
--- z3c.macro/trunk/CHANGES.txt	2010-07-04 21:34:51 UTC (rev 114188)
+++ z3c.macro/trunk/CHANGES.txt	2010-07-05 06:43:33 UTC (rev 114189)
@@ -5,9 +5,14 @@
 1.2.2 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- Tests now require ``zope.browserpage >= 3.12`` instead of
+  ``zope.app.pagetemplate`` as the expression type registration has
+  been moved there recently.
 
+- No longer using deprecated ``zope.testing.doctestunit`` but built-in
+  ``doctest`` instead.
 
+
 1.2.1 (2009-03-07)
 ------------------
 

Modified: z3c.macro/trunk/setup.py
===================================================================
--- z3c.macro/trunk/setup.py	2010-07-04 21:34:51 UTC (rev 114188)
+++ z3c.macro/trunk/setup.py	2010-07-05 06:43:33 UTC (rev 114189)
@@ -59,7 +59,7 @@
         test = ['z3c.template',
                 'z3c.pt>=1.0b4',
                 'lxml>=2.1.1',
-                'zope.app.pagetemplate',
+                'zope.browserpage>=3.12',
                 'zope.app.testing',
                 'zope.testing'],
         ),

Modified: z3c.macro/trunk/src/z3c/macro/tests.py
===================================================================
--- z3c.macro/trunk/src/z3c/macro/tests.py	2010-07-04 21:34:51 UTC (rev 114188)
+++ z3c.macro/trunk/src/z3c/macro/tests.py	2010-07-05 06:43:33 UTC (rev 114189)
@@ -17,18 +17,16 @@
 """
 __docformat__ = 'restructuredtext'
 
-import unittest
-import itertools
-
 from zope import component
-from zope.testing import doctest
-from zope.testing.doctestunit import DocFileSuite
 from zope.app.testing import setup
 from zope.configuration import xmlconfig
-
+import doctest
+import itertools
+import unittest
 import z3c.pt
 import z3c.ptcompat
 
+
 def setUp(test):
     root = setup.placefulSetUp(site=True)
     test.globs['root'] = root
@@ -36,8 +34,8 @@
 def setUpZPT(test):
     z3c.ptcompat.config.disable()
     setUp(test)
-    
-    from zope.app.pagetemplate import metaconfigure
+
+    from zope.browserpage import metaconfigure
     from z3c.macro import tales
     metaconfigure.registerType('macro', tales.MacroExpression)
 
@@ -49,17 +47,17 @@
     from z3c.macro import tales
     component.provideUtility(
         tales.z3cpt_macro_expression, name='macro')
-    
+
 def tearDown(test):
     setup.placefulTearDown()
 
 def test_suite():
     tests = ((
-        DocFileSuite('README.txt',
+        doctest.DocFileSuite('README.txt',
             setUp=setUp, tearDown=tearDown,
             optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS,
             ),
-        DocFileSuite('zcml.txt', setUp=setUp, tearDown=tearDown,
+        doctest.DocFileSuite('zcml.txt', setUp=setUp, tearDown=tearDown,
             optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS,),
         ) for setUp in (setUpZ3CPT, setUpZPT))