[Checkins] SVN: z3c.resourcecollector/trunk/ - Made tests compatible with Python 2.5 and newer.

[Michael Howitz]

Log message for revision 117221:
  - Made tests compatible with Python 2.5 and newer.
  
  - Added not declared but necessary dependencies.
  
  - Using Python's ``doctest`` module instead of depreacted
    ``zope.testing.doctest``.
  
  - Got rid of even undeclared `zope.app.zapi` dependency.
  

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

-=-
Modified: z3c.resourcecollector/trunk/CHANGES.txt
===================================================================
--- z3c.resourcecollector/trunk/CHANGES.txt	2010-10-04 16:35:30 UTC (rev 117220)
+++ z3c.resourcecollector/trunk/CHANGES.txt	2010-10-05 06:05:29 UTC (rev 117221)
@@ -5,6 +5,19 @@
 TODO: add tests for the viewlets !!!!
       Fix the workaround in getUrl of the utility.
 
+unreleased 1.1.4
+----------------
+
+- Made tests compatible with Python 2.5 and newer.
+
+- Added not declared but necessary dependencies.
+
+- Using Python's ``doctest`` module instead of depreacted
+  ``zope.testing.doctest``.
+
+- Got rid of even undeclared `zope.app.zapi` dependency.
+
+
 2008/07/30 1.1.3
 ----------------
 

Modified: z3c.resourcecollector/trunk/setup.py
===================================================================
--- z3c.resourcecollector/trunk/setup.py	2010-10-04 16:35:30 UTC (rev 117220)
+++ z3c.resourcecollector/trunk/setup.py	2010-10-05 06:05:29 UTC (rev 117221)
@@ -17,19 +17,21 @@
                                 'z3c.testing',
                                 'zope.testbrowser'
                                 ]),
-      install_requires=['setuptools',
-                        'zope.configuration',
-                        'zope.interface',
-                        'zope.component',
-                        'zope.app.component',
-                        'zope.app.appsetup',
-                        'zope.app.wsgi',
-                        'zope.cachedescriptors',
-                        'zope.publisher',
-                        'zope.schema',
-                        'zope.security',
-                        'zope.viewlet',
-                        ],
+      install_requires=[
+          'setuptools',
+          'zope.app.appsetup',
+          'zope.app.component',
+          'zope.app.form',
+          'zope.app.wsgi',
+          'zope.cachedescriptors',
+          'zope.component',
+          'zope.configuration',
+          'zope.interface',
+          'zope.publisher',
+          'zope.schema',
+          'zope.security',
+          'zope.viewlet',
+          ],
       include_package_data = True,
       zip_safe = False,
       )

Modified: z3c.resourcecollector/trunk/src/z3c/resourcecollector/tests.py
===================================================================
--- z3c.resourcecollector/trunk/src/z3c/resourcecollector/tests.py	2010-10-04 16:35:30 UTC (rev 117220)
+++ z3c.resourcecollector/trunk/src/z3c/resourcecollector/tests.py	2010-10-05 06:05:29 UTC (rev 117221)
@@ -13,22 +13,18 @@
 ##############################################################################
 __docformat__ = "reStructuredText"
 
-import os
+from zope.testing import renormalizing
 import doctest
-import unittest
+import re
 
-from zope.testing import doctest
 
-from zope.testing.doctestunit import DocFileSuite, DocTestSuite
-
-
 def test_suite():
-    return unittest.TestSuite(
-        (DocFileSuite('zcml.txt',
-                  optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS,
-                  ),
-        ))
-
-if __name__ == '__main__':
-    unittest.main(defaultTest='test_suite')
-
+    return doctest.DocFileSuite(
+        'zcml.txt',
+        checker=renormalizing.RENormalizing([
+            (re.compile(
+                "<class 'zope.component.interfaces.ComponentLookupError'>"),
+             'zope.component.interfaces.ComponentLookupError')
+            ]),
+        optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS,
+        )

Modified: z3c.resourcecollector/trunk/src/z3c/resourcecollector/zcml.py
===================================================================
--- z3c.resourcecollector/trunk/src/z3c/resourcecollector/zcml.py	2010-10-04 16:35:30 UTC (rev 117220)
+++ z3c.resourcecollector/trunk/src/z3c/resourcecollector/zcml.py	2010-10-05 06:05:29 UTC (rev 117221)
@@ -17,7 +17,6 @@
 import zope.component
 import zope.schema
 
-from zope.app import zapi
 from zope.app.publisher.browser import metaconfigure
 
 from interfaces import ICollectorUtility
@@ -48,7 +47,8 @@
 
 def handleCollector(_context, name, type, content_type = None):
 
-    zapi.getGlobalSiteManager().registerUtility(CollectorUtility(content_type),name=name)
+    zope.component.getGlobalSiteManager().registerUtility(
+        CollectorUtility(content_type),name=name)
     class_=CollectorResource
     for_ = (zope.interface.Interface,)
     provides = zope.interface.Interface