Massage the tests.

src/grokcore/view/ftesting.zcml

@@ -65,4 +65,11 @@
   <grantAll role="zope.Manager" />
   <grant role="zope.Manager" principal="zope.mgr" />
 
+  <!-- Register a test fixture -->
+  <adapter
+     factory="grokcore.view.ftests.static.simple.DummyResource"
+     for="zope.publisher.interfaces.browser.IBrowserRequest"
+     provides="zope.interface.Interface"
+     name="grokcore.view.ftests.static.simple_fixture" />
+
 </configure>

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

@@ -1,9 +1,8 @@
-"""
-We use a special name 'static' in page templates to allow easy linking
+"""We use a special name 'static' in page templates to allow easy linking
 to resources.
 
-In the context of a grok application, you can use fanstatic (through zope.fanstatic)
-instead of the dummy implementation in this test:
+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
   >>> browser = Browser()
@@ -25,7 +24,7 @@
 
 from zope.traversing.interfaces import ITraversable
 from zope.traversing.browser.interfaces import IAbsoluteURL
-from zope.publisher.interfaces.browser import IBrowserRequest
+
 
 class DummyResource(object):
     """ Dummy resource implementation. """
@@ -41,8 +40,3 @@ def traverse(self, name, furtherPath):
 
     def __str__(self):
         return 'dummy:%s' % self.name
-
-zope.component.provideAdapter(factory=DummyResource,
-    adapts=(IBrowserRequest,),
-    provides=zope.interface.Interface,
-    name='grokcore.view.ftests.static.simple_fixture')

src/grokcore/view/ftests/static/simple_fixture/ellie.py

@@ -1,8 +1,10 @@
 import grokcore.view as grok
 
+
 class Mammoth(grok.Context):
     pass
 
+
 class Index(grok.View):
     pass
 

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

@@ -30,21 +30,26 @@
 """
 import grokcore.view as grok
 
+
 class Mammoth(grok.Context):
     pass
 
+
 class Index(grok.View):
     def render(self):
         self.redirect(self.url('another'))
 
+
 class TrustedRedirect(grok.View):
     def render(self):
         self.redirect('http://www.google.com/ncr', trusted=True)
 
+
 class RedirectWithStatus(grok.View):
     def render(self):
         self.redirect(self.url(), status=418)
 
+
 class Another(grok.View):
     def render(self):
         return "Another view"

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

@@ -155,9 +155,10 @@
   >>> print result
   http://127.0.0.1/herd/manfred/index?key=%C3%A9&key=2
 
-  >>> import cgi
-  >>> print unicode(cgi.parse_qs(result.split('?')[1])['key'][0], 'utf-8')
-  é
+  >>> from cgi import parse_qs
+  >>> expected = unicode('é', 'UTF-8')
+  >>> unicode(parse_qs(result.split('?')[1])['key'][0], 'UTF-8') == expected
+  True
 
 Zope magic!! Here we test casting parameters in the CGI query string:
 
@@ -213,40 +214,50 @@
 import grokcore.view as grok
 from zope.container.contained import Contained
 
+
 class Mammoth(Contained):
     pass
 
+
 grok.context(Mammoth)
 
+
 class Index(grok.View):
     def render(self):
         return self.url()
 
+
 class Another(grok.View):
     def render(self):
         return self.url()
 
+
 class YetAnother(grok.View):
     pass
 
+
 class Multiplier(grok.View):
     def update(self, age=0):
         self.age = age
 
     def render(self):
         return unicode(self.age * 2)
 
+
 yetanother = grok.PageTemplate('<p tal:replace="view/url" />')
 
+
 class URLTestingSkin(grok.IBrowserRequest):
     grok.skin('urltesting')
 
+
 class AnotherURLTestingSkin(grok.IBrowserRequest):
     grok.skin('anotherurltesting')
 
+
 class URLTestingViewOnASkin(grok.View):
     grok.layer(URLTestingSkin)
     grok.name('test')
 
     def render(self):
-        return u"I'm on a url testing skin: %s" % self.url()
+        return u"I'm on a url testing skin: {}".format(self.url())

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

@@ -68,10 +68,10 @@
 
   >>> url(request, herd, '@@sample_view', data=dict(age=28))
   'http://127.0.0.1/herd/@@sample_view?age=28'
-  
+
   >>> url(request, herd, data=dict(age=28))
   'http://127.0.0.1/herd?age=28'
-  
+
 There is no problem putting one of the 'reserved' arguments inside the data
 argument or explicitely supplying 'None':
 
@@ -92,10 +92,10 @@
   >>> withquery = url(request, herd, 'sample_view', data=dict(a=1, b=2, c=3))
   >>> withquery.find('a=1') > -1
   True
-  
+
   >>> withquery.find('b=2') > -1
   True
-  
+
   >>> withquery.find('c=3') > -1
   True
 
@@ -109,15 +109,19 @@
 from grokcore.view import url
 from zope.container.contained import Contained
 
+
 class Mammoth(Contained):
     pass
 
+
 grok.context(Mammoth)
 
+
 class Index(grok.View):
     def render(self):
         return url(self.request, self)
 
+
 class Another(grok.View):
     def render(self):
         return url(self.request, self)

src/grokcore/view/meta/directoryresource.py

@@ -15,7 +15,7 @@
 
 import os
 
-from zope import interface, component
+from zope import interface
 from zope.security.checker import NamesChecker
 from zope.publisher.interfaces.browser import IDefaultBrowserLayer