Dropped the dependency on zope.app.zcmlfiles.

Adapted the setup.py accordingly. Updated CHANGES.txt.

CHANGES.txt

@@ -1,16 +1,22 @@
 Changes
 =======
 
-1.5 (unreleased)
-----------------
+1.4.1 (unreleased)
+------------------
+
+* Dropped the dependency on ``zope.app.zcmlfiles``.
 
-- Nothing changed yet.
+* Cleaned the code to remove unused imports and ensure the pep8 syntax.
 
+* Updated tests to have a return value consistency. The
+  grokcore.viewlet viewlet manager implementation requires viewlets to
+  return unicode strings. Now, viewlets return unicode strings in the
+  test packages.
 
 1.4 (2010-02-19)
 ----------------
 
-- Define test requires.
+* Define test requires.
 
 1.3 (2009-09-17)
 ----------------

setup.py

@@ -11,14 +11,21 @@ def read(*rnames):
     )
 
 tests_require = [
-    'zope.app.authentication',
+    'zope.annotation',
+    'zope.app.appsetup',
+    'zope.app.pagetemplate',
+    'zope.app.publication',
     'zope.app.testing',
-    'zope.app.zcmlfiles',
+    'zope.browserpage',
     'zope.configuration',
+    'zope.container',
     'zope.contentprovider',
+    'zope.principalregistry',
     'zope.securitypolicy',
+    'zope.site',
     'zope.testbrowser',
     'zope.testing',
+    'zope.traversing',
     ]
 
 setup(

src/grokcore/viewlet/ftesting.zcml

@@ -5,17 +5,29 @@
    i18n_domain="grok"
    package="grokcore.viewlet">
 
-  <include package="zope.app.zcmlfiles" file="meta.zcml" />
+  <include package="zope.component" file="meta.zcml" />
+  <include package="zope.security" file="meta.zcml" />
   <include package="zope.securitypolicy" file="meta.zcml" />
+  <include package="zope.principalregistry" file="meta.zcml" />
+  <include package="zope.browserpage" file="meta.zcml" />
+  <include package="zope.publisher" file="meta.zcml" />
+  <include package="zope.app.pagetemplate" file="meta.zcml" />
+  <include package="zope.app.publication" file="meta.zcml" />
 
   <!-- Viewlet includes only minimal view, need full for testing -->
   <include package="grokcore.view" file="meta.zcml" />
   <include package="grokcore.viewlet" file="meta.zcml" />
 
-  <include package="zope.app.zcmlfiles" />
-  <include package="zope.app.authentication" />
+  <include package="zope.security" />
   <include package="zope.securitypolicy" />
+  <include package="zope.traversing" />
+  <include package="zope.site" />
+  <include package="zope.container" />
+  <include package="zope.annotation" />
+  <include package="zope.principalregistry" />
   <include package="zope.contentprovider" />
+  <include package="zope.app.appsetup" />
+  <include package="zope.app.publication" />
   <include package="grokcore.viewlet" />
 
   <!-- We define our test permission here (don't have grok.Role) -->
@@ -38,6 +50,7 @@
       id="zope.anybody"
       title="Unauthenticated User"
       />
+
   <grant
       permission="zope.View"
       principal="zope.anybody"