[Checkins] SVN: zope.viewlet/trunk/ Drop all testing dependncies except ``zope.testing``. Fix useless module description.

Dan Korostelev nadako at gmail.com
Tue Mar 17 17:27:19 EDT 2009


Log message for revision 98216:
  Drop all testing dependncies except ``zope.testing``. Fix useless module description.

Changed:
  U   zope.viewlet/trunk/CHANGES.txt
  U   zope.viewlet/trunk/setup.py
  U   zope.viewlet/trunk/src/zope/viewlet/__init__.py
  U   zope.viewlet/trunk/src/zope/viewlet/tests.py

-=-
Modified: zope.viewlet/trunk/CHANGES.txt
===================================================================
--- zope.viewlet/trunk/CHANGES.txt	2009-03-17 21:10:48 UTC (rev 98215)
+++ zope.viewlet/trunk/CHANGES.txt	2009-03-17 21:27:19 UTC (rev 98216)
@@ -7,7 +7,9 @@
 
 - Remove ZCML slugs and old zpkg-related files.
 
+- Drop all testing dependncies except ``zope.testing``.
 
+
 3.5.0 (2009-01-26)
 ------------------
 

Modified: zope.viewlet/trunk/setup.py
===================================================================
--- zope.viewlet/trunk/setup.py	2009-03-17 21:10:48 UTC (rev 98215)
+++ zope.viewlet/trunk/setup.py	2009-03-17 21:27:19 UTC (rev 98216)
@@ -55,10 +55,7 @@
       package_dir = {'': 'src'},
       namespace_packages=['zope'],
       extras_require = dict(
-          test=['zope.app.testing',
-                'zope.testing',
-                'zope.app.securitypolicy',
-                'zope.app.zcmlfiles']),
+          test=['zope.testing',]),
       install_requires=[
           'setuptools',
           'zope.app.pagetemplate',

Modified: zope.viewlet/trunk/src/zope/viewlet/__init__.py
===================================================================
--- zope.viewlet/trunk/src/zope/viewlet/__init__.py	2009-03-17 21:10:48 UTC (rev 98215)
+++ zope.viewlet/trunk/src/zope/viewlet/__init__.py	2009-03-17 21:27:19 UTC (rev 98216)
@@ -11,7 +11,6 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-"""Viewlet exceptions
-
+"""
 $Id$
 """

Modified: zope.viewlet/trunk/src/zope/viewlet/tests.py
===================================================================
--- zope.viewlet/trunk/src/zope/viewlet/tests.py	2009-03-17 21:10:48 UTC (rev 98215)
+++ zope.viewlet/trunk/src/zope/viewlet/tests.py	2009-03-17 21:27:19 UTC (rev 98216)
@@ -16,20 +16,18 @@
 $Id$
 """
 __docformat__ = 'restructuredtext'
+import sys
+import unittest
 
-import unittest
 import zope.component
-import zope.security
-from zope.testing import doctest
-from zope.testing.doctestunit import DocFileSuite
-from zope.app.testing import setup
+from zope.testing import doctest, cleanup
+from zope.traversing.testing import setUp as traversingSetUp
+from zope.component import eventtesting
 
-class TestParticipation(object):
-    principal = 'foobar'
-    interaction = None
-
 def setUp(test):
-    setup.placefulSetUp()
+    cleanup.setUp()
+    eventtesting.setUp()
+    traversingSetUp()
 
     # resource namespace setup
     from zope.traversing.interfaces import ITraversable
@@ -43,28 +41,38 @@
     from zope.contentprovider import tales
     metaconfigure.registerType('provider', tales.TALESProviderExpression)
 
-    zope.security.management.getInteraction().add(TestParticipation())
+def tearDown(test):
+    cleanup.tearDown()
 
+class FakeModule(object):
+    """A fake module."""
+    
+    def __init__(self, dict):
+        self.__dict = dict
+
+    def __getattr__(self, name):
+        try:
+            return self.__dict[name]
+        except KeyError:
+            raise AttributeError(name)
+
 def directivesSetUp(test):
     setUp(test)
-    setup.setUpTestAsModule(test, 'zope.viewlet.directives')
+    test.globs['__name__'] = 'zope.viewlet.directives'
+    sys.modules['zope.viewlet.directives'] = FakeModule(test.globs)
 
-
-def tearDown(test):
-    setup.placefulTearDown()
-
 def directivesTearDown(test):
     tearDown(test)
-    setup.tearDownTestAsModule(test)
+    del sys.modules[test.globs['__name__']]
+    test.globs.clear()
 
-
 def test_suite():
     return unittest.TestSuite((
-        DocFileSuite('README.txt',
+        doctest.DocFileSuite('README.txt',
                      setUp=setUp, tearDown=tearDown,
                      optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS,
                      ),
-        DocFileSuite('directives.txt',
+        doctest.DocFileSuite('directives.txt',
                      setUp=directivesSetUp, tearDown=directivesTearDown,
                      optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS,
                      ),



More information about the Checkins mailing list