[Zope-Checkins] SVN: Zope/trunk/ zopedoctest no longer breaks if the URL contains more than one question mark. It broke even when the second question mark was correctly quoted.

[Michael Howitz]

Log message for revision 91638:
  zopedoctest no longer breaks if the URL contains more than one question mark. It broke even when the second question mark was correctly quoted.
  

Changed:
  U   Zope/trunk/doc/CHANGES.txt
  U   Zope/trunk/lib/python/Testing/ZopeTestCase/zopedoctest/FunctionalDocTest.txt
  U   Zope/trunk/lib/python/Testing/ZopeTestCase/zopedoctest/functional.py

-=-
Modified: Zope/trunk/doc/CHANGES.txt
===================================================================
--- Zope/trunk/doc/CHANGES.txt	2008-09-30 07:47:32 UTC (rev 91637)
+++ Zope/trunk/doc/CHANGES.txt	2008-09-30 15:29:43 UTC (rev 91638)
@@ -454,6 +454,10 @@
       - Prevent ZPublisher from insering incorrect <base/> tags into the
         headers of plain html files served from Zope3 resource directories.
 
+      - zopedoctest no longer breaks if the URL contains more than one
+        question mark. It broke even when the second question mark was
+        correctly quoted.
+
     Other Changes
 
       - Disabled docutils file inclusion completely, rather than trying

Modified: Zope/trunk/lib/python/Testing/ZopeTestCase/zopedoctest/FunctionalDocTest.txt
===================================================================
--- Zope/trunk/lib/python/Testing/ZopeTestCase/zopedoctest/FunctionalDocTest.txt	2008-09-30 07:47:32 UTC (rev 91637)
+++ Zope/trunk/lib/python/Testing/ZopeTestCase/zopedoctest/FunctionalDocTest.txt	2008-09-30 15:29:43 UTC (rev 91638)
@@ -116,6 +116,17 @@
   HTTP/1.1 500 Internal Server Error
   ...Content-Type: text/html...TypeError...
 
+Test parameter containing an additional '?'
+
+  >>> print http(r"""
+  ... GET /test_folder_1_?foo=bla%3Fbaz HTTP/1.1
+  ... """)
+  HTTP/1.1 200 OK
+  Content-Length: 5
+  Content-Type: text/plain; charset=iso-8859-15
+  <BLANKLINE>
+  index
+              
 Test Unauthorized
 
   >>> self.folder.index_html.manage_permission('View', ['Owner'])

Modified: Zope/trunk/lib/python/Testing/ZopeTestCase/zopedoctest/functional.py
===================================================================
--- Zope/trunk/lib/python/Testing/ZopeTestCase/zopedoctest/functional.py	2008-09-30 07:47:32 UTC (rev 91637)
+++ Zope/trunk/lib/python/Testing/ZopeTestCase/zopedoctest/functional.py	2008-09-30 15:29:43 UTC (rev 91638)
@@ -144,7 +144,7 @@
            "SERVER_PROTOCOL": protocol,
            }
 
-    p = path.split('?')
+    p = path.split('?', 1)
     if len(p) == 1:
         env['PATH_INFO'] = p[0]
     elif len(p) == 2: