[Checkins] SVN: zope.etree/trunk/s - Allow usage of NORMALIZE_WHITESPACE with XML tag content

[Sidnei da Silva]

Log message for revision 78675:
   - Allow usage of NORMALIZE_WHITESPACE with XML tag content

Changed:
  U   zope.etree/trunk/setup.py
  U   zope.etree/trunk/src/zope/etree/testing.py

-=-
Modified: zope.etree/trunk/setup.py
===================================================================
--- zope.etree/trunk/setup.py	2007-08-07 17:54:51 UTC (rev 78674)
+++ zope.etree/trunk/setup.py	2007-08-07 18:56:37 UTC (rev 78675)
@@ -16,11 +16,12 @@
 
 setup(
     name="zope.etree",
-    version="0.1dev",
+    version="0.1",
     packages=find_packages('src'),
     package_dir={'':'src'},
     namespace_packages=['zope'],
     include_package_data=True,
-    install_requires = ['setuptools'],
-    zip_safe = False,
+    install_requires=['setuptools'],
+    zip_safe=False,
+    test_suite='zope.etree.tests.test_suite',
     )

Modified: zope.etree/trunk/src/zope/etree/testing.py
===================================================================
--- zope.etree/trunk/src/zope/etree/testing.py	2007-08-07 17:54:51 UTC (rev 78674)
+++ zope.etree/trunk/src/zope/etree/testing.py	2007-08-07 18:56:37 UTC (rev 78675)
@@ -107,6 +107,12 @@
       >>> _assertTextEqual("test", "test", XMLDATA)
       (True, None)
 
+    Normalize Whitespace
+
+      >>> _assertTextEqual("test\\nthis", "test this", 
+      ...                  XMLDATA|doctest.NORMALIZE_WHITESPACE)
+      (True, None)
+
     Unequal values.
 
       >>> _assertTextEqual("test", None, XMLDATA)
@@ -138,7 +144,8 @@
            not isinstance(tgot, (str, unicode)):
         raise ValueError("_assertTextEqual can only tests text content")
 
-    if twant == tgot:
+    checker = doctest.OutputChecker()
+    if checker.check_output(twant, tgot, optionflags):
         return True, None
     return False, "'%r != %r' have different element content." %(want, got)