[Checkins] SVN: megrok.chameleon/trunk/s Update to groktoolkit trunk, tear out zope.app.zcmlfiles.

[Jan-Jaap Driessen]

Log message for revision 122186:
  Update to groktoolkit trunk, tear out zope.app.zcmlfiles.

Changed:
  U   megrok.chameleon/trunk/setup.py
  U   megrok.chameleon/trunk/src/megrok/chameleon/ftesting.zcml
  U   megrok.chameleon/trunk/src/megrok/chameleon/tests/cpt_fixture/app.py
  U   megrok.chameleon/trunk/src/megrok/chameleon/tests/test_megrok_chameleon.py

-=-
Modified: megrok.chameleon/trunk/setup.py
===================================================================
--- megrok.chameleon/trunk/setup.py	2011-07-13 17:17:40 UTC (rev 122185)
+++ megrok.chameleon/trunk/setup.py	2011-07-13 17:40:40 UTC (rev 122186)
@@ -14,7 +14,7 @@
 tests_require = [
     'grokcore.viewlet',
     'zope.app.wsgi',
-    'zope.app.zcmlfiles',
+    'zope.app.appsetup',
     ]
 
 long_description = (open('README.txt').read() +

Modified: megrok.chameleon/trunk/src/megrok/chameleon/ftesting.zcml
===================================================================
--- megrok.chameleon/trunk/src/megrok/chameleon/ftesting.zcml	2011-07-13 17:17:40 UTC (rev 122185)
+++ megrok.chameleon/trunk/src/megrok/chameleon/ftesting.zcml	2011-07-13 17:40:40 UTC (rev 122186)
@@ -4,38 +4,15 @@
    i18n_domain="megrok.chameleon"
    package="megrok.chameleon">
 
-  <!-- Typical functional testing security setup -->
-  <include package="zope.app.zcmlfiles" file="meta.zcml" />
-  <include package="zope.securitypolicy" file="meta.zcml" />
+  <include package="zope.component" file="meta.zcml"/>
+  <include package="zope.security" file="meta.zcml"/>
+  <include package="zope.browserpage" file="meta.zcml"/>
   <include package="grokcore.viewlet" file="meta.zcml" />
 
-  <include package="zope.app.zcmlfiles" />
-  <include package="zope.app.authentication" />
-  <include package="grokcore.viewlet" />
-  <include package="megrok.chameleon" />
-
-  <securityPolicy
-      component="zope.securitypolicy.zopepolicy.ZopeSecurityPolicy"
-      />
-
-  <unauthenticatedPrincipal
-      id="zope.anybody"
-      title="Unauthenticated User"
-      />
-  <grant
-      permission="zope.View"
-      principal="zope.anybody"
-      />
-
-  <principal
-      id="zope.mgr"
-      title="Manager"
-      login="mgr"
-      password="mgrpw"
-      />
-
-  <role id="zope.Manager" title="Site Manager" />
-  <grantAll role="zope.Manager" />
-  <grant role="zope.Manager" principal="zope.mgr" />
-
+  <include package="zope.traversing"/>
+  <include package="zope.traversing.browser"/>
+  <include package="zope.container"/>
+  <include package="zope.app.appsetup"/>
+  <include package="grokcore.viewlet"/>
+  <include package="megrok.chameleon"/>
 </configure>

Modified: megrok.chameleon/trunk/src/megrok/chameleon/tests/cpt_fixture/app.py
===================================================================
--- megrok.chameleon/trunk/src/megrok/chameleon/tests/cpt_fixture/app.py	2011-07-13 17:17:40 UTC (rev 122185)
+++ megrok.chameleon/trunk/src/megrok/chameleon/tests/cpt_fixture/app.py	2011-07-13 17:40:40 UTC (rev 122186)
@@ -1,5 +1,5 @@
 from grokcore.component.interfaces import IContext
-from zope.app.container.btree import BTreeContainer
+from zope.container.btree import BTreeContainer
 from zope.interface import implements
 from megrok.chameleon import components
 

Modified: megrok.chameleon/trunk/src/megrok/chameleon/tests/test_megrok_chameleon.py
===================================================================
--- megrok.chameleon/trunk/src/megrok/chameleon/tests/test_megrok_chameleon.py	2011-07-13 17:17:40 UTC (rev 122185)
+++ megrok.chameleon/trunk/src/megrok/chameleon/tests/test_megrok_chameleon.py	2011-07-13 17:40:40 UTC (rev 122186)
@@ -43,16 +43,15 @@
     """Get a testsuite of all doctests.
     """
     suite = unittest.TestSuite()
-    for name in ['README.txt']:
-        test = doctest.DocFileSuite(
-            name,
-            setUp=setUpStatic,
-            package=megrok.chameleon,
-            globs=dict(
-                getRootFolder=FunctionalLayer.getRootFolder,
-                ),
-            optionflags=FLAGS,
-            )
-        test.layer = FunctionalLayer
-        suite.addTest(test)
+    test = doctest.DocFileSuite(
+        'README.txt',
+        setUp=setUpStatic,
+        package=megrok.chameleon,
+        globs=dict(
+            getRootFolder=FunctionalLayer.getRootFolder,
+            ),
+        optionflags=FLAGS,
+        )
+    test.layer = FunctionalLayer
+    suite.addTest(test)
     return suite