[Zope-Checkins] SVN: Zope/trunk/lib/python/Testing/ZopeTestCase/zopedoctest/ Merged Zope-2_9-branch r40958:40959 into the trunk.

[Stefan H. Holek]

Log message for revision 40960:
  Merged Zope-2_9-branch r40958:40959 into the trunk.
  (Content-Type header now contains a charset.)
  

Changed:
  U   Zope/trunk/lib/python/Testing/ZopeTestCase/zopedoctest/FunctionalDocTest.txt
  U   Zope/trunk/lib/python/Testing/ZopeTestCase/zopedoctest/testFunctionalDocTest.py

-=-
Modified: Zope/trunk/lib/python/Testing/ZopeTestCase/zopedoctest/FunctionalDocTest.txt
===================================================================
--- Zope/trunk/lib/python/Testing/ZopeTestCase/zopedoctest/FunctionalDocTest.txt	2005-12-21 15:45:06 UTC (rev 40959)
+++ Zope/trunk/lib/python/Testing/ZopeTestCase/zopedoctest/FunctionalDocTest.txt	2005-12-21 15:47:40 UTC (rev 40960)
@@ -82,7 +82,7 @@
   ... """, handle_errors=False)
   HTTP/1.1 200 OK
   Content-Length: 5
-  Content-Type: text/plain
+  Content-Type: text/plain; charset=...
   <BLANKLINE>
   index
 
@@ -93,7 +93,7 @@
   ... """, handle_errors=False)
   HTTP/1.1 200 OK
   Content-Length: 1
-  Content-Type: text/plain
+  Content-Type: text/plain; charset=...
   <BLANKLINE>
   1
 
@@ -104,7 +104,7 @@
   ... """, handle_errors=False)
   HTTP/1.1 200 OK
   Content-Length: 1
-  Content-Type: text/plain
+  Content-Type: text/plain; charset=...
   <BLANKLINE>
   3
 
@@ -174,7 +174,7 @@
   ... """, handle_errors=False)
   HTTP/1.1 200 OK
   Content-Length: 23
-  Content-Type: text/plain
+  Content-Type: text/plain; charset=...
   <BLANKLINE>
   foo: bar
   baz: oki doki

Modified: Zope/trunk/lib/python/Testing/ZopeTestCase/zopedoctest/testFunctionalDocTest.py
===================================================================
--- Zope/trunk/lib/python/Testing/ZopeTestCase/zopedoctest/testFunctionalDocTest.py	2005-12-21 15:45:06 UTC (rev 40959)
+++ Zope/trunk/lib/python/Testing/ZopeTestCase/zopedoctest/testFunctionalDocTest.py	2005-12-21 15:47:40 UTC (rev 40960)
@@ -35,7 +35,7 @@
     ... """)
     HTTP/1.1 200 OK
     Content-Length: 5
-    Content-Type: text/plain
+    Content-Type: text/plain; charset=...
     <BLANKLINE>
     index
     '''