[Checkins] SVN: zope.testbrowser/trunk/src/zope/testbrowser/test merge from nikhil_npy-2.5

[nikhil n]

Log message for revision 78917:
  merge from nikhil_npy-2.5

Changed:
  U   zope.testbrowser/trunk/src/zope/testbrowser/testing.py
  U   zope.testbrowser/trunk/src/zope/testbrowser/tests.py

-=-
Modified: zope.testbrowser/trunk/src/zope/testbrowser/testing.py
===================================================================
--- zope.testbrowser/trunk/src/zope/testbrowser/testing.py	2007-08-18 01:58:20 UTC (rev 78916)
+++ zope.testbrowser/trunk/src/zope/testbrowser/testing.py	2007-08-18 05:31:06 UTC (rev 78917)
@@ -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/trunk/src/zope/testbrowser/tests.py
===================================================================
--- zope.testbrowser/trunk/src/zope/testbrowser/tests.py	2007-08-18 01:58:20 UTC (rev 78916)
+++ zope.testbrowser/trunk/src/zope/testbrowser/tests.py	2007-08-18 05:31:06 UTC (rev 78917)
@@ -367,6 +367,9 @@
     (re.compile(r'Status: 200.*'), 'Status: 200 OK'),
     (re.compile(r'httperror_seek_wrapper:', re.M), 'HTTPError:'),
     (win32CRLFtransformer(), None),
+    (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(