[Checkins] SVN: grok/branches/ulif-adminless/src/grok/ Merge in changes from trunk.

[Uli Fouquet]

Log message for revision 88367:
  Merge in changes from trunk.

Changed:
  U   grok/branches/ulif-adminless/src/grok/ftests/test_grok_functional.py
  U   grok/branches/ulif-adminless/src/grok/testing.py

-=-
Modified: grok/branches/ulif-adminless/src/grok/ftests/test_grok_functional.py
===================================================================
--- grok/branches/ulif-adminless/src/grok/ftests/test_grok_functional.py	2008-07-14 18:03:28 UTC (rev 88366)
+++ grok/branches/ulif-adminless/src/grok/ftests/test_grok_functional.py	2008-07-14 22:02:52 UTC (rev 88367)
@@ -9,7 +9,8 @@
                                          FunctionalTestSetup, sync, ZCMLLayer)
 
 ftesting_zcml = os.path.join(os.path.dirname(grok.__file__), 'ftesting.zcml')
-GrokFunctionalLayer = ZCMLLayer(ftesting_zcml, __name__, 'GrokFunctionalLayer')
+GrokFunctionalLayer = ZCMLLayer(ftesting_zcml, __name__, 'GrokFunctionalLayer',
+                                allow_teardown=True)
 
 def setUp(test):
     FunctionalTestSetup().setUp()

Modified: grok/branches/ulif-adminless/src/grok/testing.py
===================================================================
--- grok/branches/ulif-adminless/src/grok/testing.py	2008-07-14 18:03:28 UTC (rev 88366)
+++ grok/branches/ulif-adminless/src/grok/testing.py	2008-07-14 22:02:52 UTC (rev 88367)
@@ -16,10 +16,9 @@
 import sys
 import os.path
 import z3c.testsetup
-import grokcore.component
 from zope.configuration.config import ConfigurationMachine
-from martian import scan
 from grokcore.component import zcml
+# Provide this import here for BBB reasons:
 from grokcore.component.testing import grok_component
 
 class GrokTestCollector(z3c.testsetup.TestCollector):