[Checkins] SVN: zope.testbrowser/trunk/ make zope.testbrowser work with 3.4.0 KGS

[Benji York]

Log message for revision 95681:
  make zope.testbrowser work with 3.4.0 KGS
  

Changed:
  U   zope.testbrowser/trunk/CHANGES.txt
  U   zope.testbrowser/trunk/buildout.cfg
  U   zope.testbrowser/trunk/src/zope/testbrowser/README.txt
  U   zope.testbrowser/trunk/src/zope/testbrowser/tests.py

-=-
Modified: zope.testbrowser/trunk/CHANGES.txt
===================================================================
--- zope.testbrowser/trunk/CHANGES.txt	2009-01-31 14:20:00 UTC (rev 95680)
+++ zope.testbrowser/trunk/CHANGES.txt	2009-01-31 14:20:21 UTC (rev 95681)
@@ -7,6 +7,7 @@
 
 - ...
 
+
 3.6.0a2 (2009-01-31)
 --------------------
 
@@ -14,6 +15,7 @@
 
 - Remove useless test dependency in zope.app.component.
 
+
 3.6.0a1 (2009-01-08)
 --------------------
 

Modified: zope.testbrowser/trunk/buildout.cfg
===================================================================
--- zope.testbrowser/trunk/buildout.cfg	2009-01-31 14:20:00 UTC (rev 95680)
+++ zope.testbrowser/trunk/buildout.cfg	2009-01-31 14:20:21 UTC (rev 95681)
@@ -2,7 +2,7 @@
 develop = .
 parts = test interpreter
 index = http://pypi.python.org/simple
-extends = http://download.zope.org/zope3.4/versions.cfg
+extends = http://download.zope.org/zope3.4/3.4.0/versions.cfg
 versions = versions
 allow-picked-versions = false
 use-dependency-links = false
@@ -13,6 +13,7 @@
 ClientForm = 0.2.10
 mechanize = 0.1.10
 setuptools = 0.6c9
+zope.site = 3.5.1
 
 [test]
 recipe = zc.recipe.testrunner

Modified: zope.testbrowser/trunk/src/zope/testbrowser/README.txt
===================================================================
--- zope.testbrowser/trunk/src/zope/testbrowser/README.txt	2009-01-31 14:20:00 UTC (rev 95680)
+++ zope.testbrowser/trunk/src/zope/testbrowser/README.txt	2009-01-31 14:20:21 UTC (rev 95681)
@@ -1312,8 +1312,8 @@
     >>> browser.open('http://localhost/invalid')
     Traceback (most recent call last):
     ...
-    NotFound: Object: <zope.site.folder.Folder object at ...>,
-              name: u'invalid'
+    NotFound: Object: <zope.site.folder.Folder object at 0x8e00b6c>,
+        name: u'invalid'
 
     >>> browser.raiseHttpErrors = True
 

Modified: zope.testbrowser/trunk/src/zope/testbrowser/tests.py
===================================================================
--- zope.testbrowser/trunk/src/zope/testbrowser/tests.py	2009-01-31 14:20:00 UTC (rev 95680)
+++ zope.testbrowser/trunk/src/zope/testbrowser/tests.py	2009-01-31 14:20:21 UTC (rev 95681)
@@ -384,6 +384,8 @@
     (re.compile(r'Host: localhost'), 'Connection: close'),
     (re.compile(r'Content-Type: '), 'Content-type: '),
     (re.compile(r'Content-Disposition: '), 'Content-disposition: '),
+    (re.compile(r'<zope.(app.folder|site).folder.Folder object at .*?>'),
+        '<zope.site.folder.Folder object at 0x12345678>'),
     ])
 
 TestBrowserLayer = zope.app.testing.functional.ZCMLLayer(