Use Browser from new zope.testbrowser version.

src/grokcore/view/ftests/contentprovider/interface.py

@@ -10,7 +10,7 @@
 Viewing the cave object should result in the content provider being displayed,
 as it is associated with the view's interface::
 
-  >>> from zope.app.wsgi.testlayer import Browser
+  >>> from zope.testbrowser.wsgi import Browser
   >>> browser = Browser()
   >>> browser.handleErrors = False
   >>> browser.open("http://localhost/cave")

src/grokcore/view/ftests/contentprovider/layer.py

@@ -7,7 +7,7 @@
 Traverse to the view on the model object. We get the content provider
 registered for the default layer::
 
-  >>> from zope.app.wsgi.testlayer import Browser
+  >>> from zope.testbrowser.wsgi import Browser
   >>> browser = Browser()
   >>> browser.handleErrors = False
   >>> browser.open("http://localhost/wilma/@@caveview")

src/grokcore/view/ftests/contentprovider/template_namespaces.py

@@ -8,7 +8,7 @@
 
 Let's look at the first template, which includes the content provider:
 
-  >>> from zope.app.wsgi.testlayer import Browser
+  >>> from zope.testbrowser.wsgi import Browser
   >>> browser = Browser()
   >>> browser.handleErrors = False
   >>> browser.open("http://localhost/cave/@@index")

src/grokcore/view/ftests/contentprovider/view_directive.py

@@ -8,7 +8,7 @@
 
   >>> root = getRootFolder()
   >>> root['fred'] = Fred()
-  >>> from zope.app.wsgi.testlayer import Browser
+  >>> from zope.testbrowser.wsgi import Browser
   >>> browser = Browser()
   >>> browser.handleErrors = False
 

src/grokcore/view/ftests/directoryresource/dirresource.py

@@ -3,7 +3,7 @@
 through the dotted name of the module in which the directoryresource is
 defined::
 
-  >>> from zope.app.wsgi.testlayer import Browser
+  >>> from zope.testbrowser.wsgi import Browser
   >>> browser = Browser()
   >>> browser.handleErrors = False
   >>> browser.open(

src/grokcore/view/ftests/static/simple.py

@@ -4,7 +4,7 @@
 In the context of a grok application, you can use fanstatic (through
 zope.fanstatic) instead of the dummy implementation in this test:
 
-  >>> from zope.app.wsgi.testlayer import Browser
+  >>> from zope.testbrowser.wsgi import Browser
   >>> browser = Browser()
   >>> browser.handleErrors = False
   >>> root = getRootFolder()

src/grokcore/view/ftests/url/redirect.py

@@ -6,7 +6,7 @@
 Since the index view redirects to mammoth, we expect to see the URL
 point to mammoth:
 
-  >>> from zope.app.wsgi.testlayer import Browser, http
+  >>> from zope.testbrowser.wsgi import Browser
   >>> browser = Browser()
   >>> browser.handleErrors = False
   >>> browser.open('http://localhost/manfred')

src/grokcore/view/ftests/url/url.py

@@ -10,7 +10,7 @@
 
 The views in this test implement self.url():
 
-  >>> from zope.app.wsgi.testlayer import Browser
+  >>> from zope.testbrowser.wsgi import Browser
   >>> browser = Browser()
   >>> browser.handleErrors = False
   >>> browser.open("http://localhost/herd/manfred/index")

src/grokcore/view/ftests/url/url_function.py

@@ -13,7 +13,7 @@
 
 Now let's use url on some things::
 
-  >>> from zope.app.wsgi.testlayer import Browser
+  >>> from zope.testbrowser.wsgi import Browser
   >>> browser = Browser()
   >>> browser.handleErrors = False
   >>> browser.open("http://localhost/herd/manfred/index")

src/grokcore/view/ftests/view/argument.py

@@ -1,7 +1,7 @@
 """
   >>> getRootFolder()["manfred"] = Mammoth()
 
-  >>> from zope.app.wsgi.testlayer import Browser
+  >>> from zope.testbrowser.wsgi import Browser
   >>> browser = Browser()
   >>> browser.handleErrors = False
 

src/grokcore/view/ftests/view/index.py

@@ -3,7 +3,7 @@
 
 The default view name for a model is 'index':
 
-  >>> from zope.app.wsgi.testlayer import Browser
+  >>> from zope.testbrowser.wsgi import Browser
   >>> browser = Browser()
   >>> browser.handleErrors = False
   >>> browser.open("http://localhost/manfred")

src/grokcore/view/ftests/view/macros.py

@@ -1,7 +1,7 @@
 """
   >>> getRootFolder()["manfred"] = Mammoth()
 
-  >>> from zope.app.wsgi.testlayer import Browser
+  >>> from zope.testbrowser.wsgi import Browser
   >>> browser = Browser()
   >>> browser.handleErrors = False
   >>> browser.open("http://localhost/manfred/@@painting")

src/grokcore/view/ftests/view/require.py

@@ -2,7 +2,7 @@
 Viewing a protected view with insufficient privileges will yield
 Unauthorized:
 
-  >>> from zope.app.wsgi.testlayer import Browser
+  >>> from zope.testbrowser.wsgi import Browser
   >>> browser = Browser()
   >>> browser.open("http://localhost/@@painting")
   Traceback (most recent call last):

src/grokcore/view/ftests/view/skindirective.py

@@ -1,7 +1,7 @@
 """
   >>> getRootFolder()["manfred"] = Mammoth()
 
-  >>> from zope.app.wsgi.testlayer import Browser
+  >>> from zope.testbrowser.wsgi import Browser
   >>> browser = Browser()
   >>> browser.handleErrors = False
   >>> browser.open("http://localhost/++skin++casual/manfred/@@hello")

src/grokcore/view/ftests/view/view.py

@@ -1,7 +1,7 @@
 """
   >>> getRootFolder()["manfred"] = Mammoth()
 
-  >>> from zope.app.wsgi.testlayer import Browser
+  >>> from zope.testbrowser.wsgi import Browser
   >>> browser = Browser()
   >>> browser.handleErrors = False
   >>> browser.open("http://localhost/manfred/@@painting")