[Zope3-checkins] CVS: Products3/z3checkins/tests - test_message.py:1.14

[Marius Gedminas]

Update of /cvs-repository/Products3/z3checkins/tests
In directory cvs.zope.org:/tmp/cvs-serv6149/tests

Modified Files:
	test_message.py 
Log Message:
Make the test match new formatting code

=== Products3/z3checkins/tests/test_message.py 1.13 => 1.14 ===
--- Products3/z3checkins/tests/test_message.py:1.13	Tue Sep  9 18:16:33 2003
+++ Products3/z3checkins/tests/test_message.py	Wed Sep 17 10:25:17 2003
@@ -755,8 +755,8 @@
 def diff(a, b):
     "Compare the differences of two sequences of strings"
 
-    if type(a) is type(''): a = a.splitlines()
-    if type(b) is type(''): b = b.splitlines()
+    if isinstance(a, (str, unicode)): a = a.splitlines()
+    if isinstance(b, (str, unicode)): b = b.splitlines()
 
     diff = []
     def dump(tag, x, lo, hi, diff=diff):
@@ -818,7 +818,7 @@
                     'Log message:\n'
                     '</pre>'
                     '<div class="log">'
-                    '<p>Blurb blurb</p>'
+                    '<p>Blurb blurb</p>\n'
                     '<p>blurb.</p>'
                     '</div>'
                     '<pre>\n'
@@ -887,7 +887,8 @@
 Modified:
    trunk/schooltool/schooltool/tests/__init__.py
 Log:
-</pre><div class="log"><p>First prototype of SchoolTool HTTP server that serves RESTful pages, complete</p><p>with unit and functional tests.</p></div><pre>
+</pre><div class="log"><p>First prototype of SchoolTool HTTP server that serves RESTful pages, complete</p>
+<p>with unit and functional tests.</p></div><pre>
 Added: trunk/schooltool/schooltool/ftests/__init__.py
 <div class="file">===================================================================
 </div><div class="oldfile">--- trunk/schooltool/schooltool/ftests/__init__.py<span class="tab">>------</span>2003-09-09 18:03:43 UTC (rev 14)
@@ -925,7 +926,7 @@
                     'Log message:\n'
                     '</pre>'
                     '<div class="log">'
-                    '<p>Blurb blurb</p>'
+                    '<p>Blurb blurb</p>\n'
                     '<p>blurb.</p>'
                     '</div>'
                     '<pre>\n'
@@ -969,7 +970,7 @@
                     'Log message:\n'
                     '</pre>'
                     '<div class="log">'
-                    '<p>Blurb blurb</p>'
+                    '<p>Blurb blurb</p>\n'
                     '<p>blurb.</p>'
                     '</div>'
                     '<pre>\n'
@@ -1008,7 +1009,7 @@
                     'Log message:\n'
                     '</pre>'
                     '<div class="log">'
-                    '<p>Blurb blurb</p>'
+                    '<p>Blurb blurb</p>\n'
                     '<p>blurb.</p>'
                     '</div>'
                     '<pre>\n'