[Checkins] SVN: Sandbox/malthe/chameleon.html/s Remove dependency on zope.testing

[Stefan Eletzhofer]

Log message for revision 92676:
  Remove dependency on zope.testing

Changed:
  U   Sandbox/malthe/chameleon.html/setup.py
  U   Sandbox/malthe/chameleon.html/src/chameleon/html/tests/test_doctests.py

-=-
Modified: Sandbox/malthe/chameleon.html/setup.py
===================================================================
--- Sandbox/malthe/chameleon.html/setup.py	2008-10-29 16:51:32 UTC (rev 92675)
+++ Sandbox/malthe/chameleon.html/setup.py	2008-10-29 16:53:19 UTC (rev 92676)
@@ -34,4 +34,5 @@
       include_package_data=True,
       zip_safe=False,
       install_requires=install_requires,
+      test_suite="chameleon.html.tests.test_doctests.test_suite",
       )

Modified: Sandbox/malthe/chameleon.html/src/chameleon/html/tests/test_doctests.py
===================================================================
--- Sandbox/malthe/chameleon.html/src/chameleon/html/tests/test_doctests.py	2008-10-29 16:51:32 UTC (rev 92675)
+++ Sandbox/malthe/chameleon.html/src/chameleon/html/tests/test_doctests.py	2008-10-29 16:53:19 UTC (rev 92676)
@@ -1,9 +1,9 @@
 import unittest
+import doctest
 import os
 
 import zope.interface
 import zope.component
-import zope.testing
 import zope.component.testing
 import zope.configuration.xmlconfig
 
@@ -14,9 +14,10 @@
 import chameleon.html.tests
 import chameleon.html.language
 
-OPTIONFLAGS = (zope.testing.doctest.ELLIPSIS |
-               zope.testing.doctest.NORMALIZE_WHITESPACE)
 
+OPTIONFLAGS = (doctest.ELLIPSIS |
+               doctest.NORMALIZE_WHITESPACE)
+
 def render_xss(body, **kwargs):
     parser = chameleon.html.language.XSSTemplateParser()
     return chameleon.core.testing.compile_template(parser, body, **kwargs)
@@ -38,16 +39,16 @@
     chameleon.core.config.DISK_CACHE = False
     
     return unittest.TestSuite(
-        [zope.testing.doctest.DocTestSuite(
-        "chameleon.html."+doctest, optionflags=OPTIONFLAGS,
+        [doctest.DocTestSuite(
+        "chameleon.html."+dt, optionflags=OPTIONFLAGS,
         setUp=setUp, tearDown=zope.component.testing.tearDown) \
-         for doctest in testsuites] + 
+         for dt in testsuites] + 
         
-        [zope.testing.doctest.DocFileSuite(
-        doctest, optionflags=OPTIONFLAGS,
+        [doctest.DocFileSuite(
+        dt, optionflags=OPTIONFLAGS,
         globs=globs,
         setUp=setUp, tearDown=zope.component.testing.tearDown,
-        package="chameleon.html") for doctest in filesuites]
+        package="chameleon.html") for dt in filesuites]
         )
 
 if __name__ == '__main__':