Update tests not to depend on zope.app.zcmfiles anymore.

Remove unused imports.

CHANGES.txt

@@ -6,6 +6,8 @@ Changes
 
 - Update functional tests to only use zope.app.appsetup instead
   of zope.app.testing.
+- Update functional tests not to require zope.app.zcmlfiles
+  anymore.
 
 1.2 (2009-12-20)
 ----------------

setup.py

@@ -12,9 +12,9 @@ def read(*rnames):
 
 tests_require = [
     'zope.app.appsetup',
-    'zope.app.zcmlfiles',
     'zope.component',
     'zope.configuration',
+    'zope.location',
     'zope.testing',
     ]
 
@@ -50,7 +50,6 @@ def read(*rnames):
                       'zope.interface',
                       'zope.lifecycleevent',
                       'zope.site',
-                      'zope.location',
                       ],
     tests_require=tests_require,
     extras_require={'test': tests_require},

src/grokcore/site/configure.zcml

@@ -4,6 +4,8 @@
     xmlns:grok="http://namespaces.zope.org/grok">
 
   <include package="." file="meta.zcml" />
+  <include package="zope.component" file="meta.zcml" />
+  <include package="zope.component" />
 
   <grok:grok package=".subscriber" />
   <utility component=".meta.setupUtility" />

src/grokcore/site/ftesting.zcml

@@ -0,0 +1,15 @@
+<configure
+   xmlns="http://namespaces.zope.org/zope"
+   xmlns:grok="http://namespaces.zope.org/grok"
+   xmlns:browser="http://namespaces.zope.org/browser"
+   i18n_domain="grokcore.site"
+   package="grokcore.site">
+
+  <include package="zope.app.appsetup" file="ftesting.zcml" />
+
+  <include package="grokcore.site" file="meta.zcml" />
+  <include package="grokcore.site" />
+
+  <grok:grok package="grokcore.site.ftests" />
+
+</configure>

src/grokcore/site/ftests/test_grok_functional.py

@@ -2,7 +2,7 @@
 import grokcore.site
 
 from pkg_resources import resource_listdir
-from zope.testing import doctest, renormalizing
+from zope.testing import doctest
 from zope.app.appsetup.testlayer import ZODBLayer
 
 FunctionalLayer = ZODBLayer(grokcore.site)

src/grokcore/site/meta.zcml

@@ -0,0 +1,9 @@
+<configure
+    xmlns="http://namespaces.zope.org/zope"
+    xmlns:meta="http://namespaces.zope.org/meta"
+    xmlns:grok="http://namespaces.zope.org/grok">
+
+  <include package="grokcore.component" file="meta.zcml" />
+  <grok:grok package=".meta" />
+
+</configure>

src/grokcore/site/tests/utility/local_implementsnone_fixture.py

@@ -0,0 +1,7 @@
+import grokcore.site
+
+class Fireplace(object):
+    pass
+
+class Cave(grokcore.site.Site):
+    grokcore.site.local_utility(Fireplace)