[Checkins] SVN: zope.testbrowser/branches/nikhil_npy-2.5/src/zope/testbrowser/test made zope.tesbrowser work with Python2.5

nikhil n nikhil.n.n at gmail.com
Fri Aug 17 10:14:42 EDT 2007


Log message for revision 78907:
  made zope.tesbrowser work with Python2.5

Changed:
  U   zope.testbrowser/branches/nikhil_npy-2.5/src/zope/testbrowser/testing.py
  U   zope.testbrowser/branches/nikhil_npy-2.5/src/zope/testbrowser/tests.py

-=-
Modified: zope.testbrowser/branches/nikhil_npy-2.5/src/zope/testbrowser/testing.py
===================================================================
--- zope.testbrowser/branches/nikhil_npy-2.5/src/zope/testbrowser/testing.py	2007-08-17 12:58:50 UTC (rev 78906)
+++ zope.testbrowser/branches/nikhil_npy-2.5/src/zope/testbrowser/testing.py	2007-08-17 14:14:42 UTC (rev 78907)
@@ -16,6 +16,7 @@
 $Id$
 """
 import re
+import sys
 import unittest
 import httplib
 import urllib2
@@ -59,7 +60,10 @@
 
         url = self._quote(url)
         # Extract the handle_error option header
-        handle_errors_key = 'X-zope-handle-errors'
+        if sys.version_info >=(2,5):
+            handle_errors_key = 'X-Zope-Handle-Errors'
+        else:
+            handle_errors_key = 'X-zope-handle-errors'
         handle_errors = headers.get(handle_errors_key, True)
         if handle_errors_key in headers:
             del headers[handle_errors_key]

Modified: zope.testbrowser/branches/nikhil_npy-2.5/src/zope/testbrowser/tests.py
===================================================================
--- zope.testbrowser/branches/nikhil_npy-2.5/src/zope/testbrowser/tests.py	2007-08-17 12:58:50 UTC (rev 78906)
+++ zope.testbrowser/branches/nikhil_npy-2.5/src/zope/testbrowser/tests.py	2007-08-17 14:14:42 UTC (rev 78907)
@@ -362,6 +362,9 @@
     (re.compile(r'User-agent:\s+\S+'), 'User-agent: Python-urllib/2.4'),
     (re.compile(r'Content-[Ll]ength:.*'), 'Content-Length: 123'),
     (re.compile(r'Status: 200.*'), 'Status: 200 OK'),
+    (re.compile(r'User-Agent: Python-urllib/2.5'), 'User-agent: Python-urllib/2.4'),
+    (re.compile(r'Host: localhost'), 'Connection: close'),
+    (re.compile (r'Content-Type: '), 'Content-type: '),
     ])
 
 TestBrowserLayer = functional.ZCMLLayer(



More information about the Checkins mailing list