[Checkins] SVN: z3c.testing/trunk/ - Removed install dependency on ``zope.app.security``.

Michael Howitz mh at gocept.com
Sat Dec 26 10:46:42 EST 2009


Log message for revision 107097:
  - Removed install dependency on ``zope.app.security``.
  
  - Removed test dependency on ``zope.app.securitypolicy``.
  
  - Removed test dependency on ``zope.app.zcmlfiles``.
  
  

Changed:
  U   z3c.testing/trunk/CHANGES.txt
  U   z3c.testing/trunk/setup.py
  U   z3c.testing/trunk/src/z3c/testing/BROWSER.txt
  U   z3c.testing/trunk/src/z3c/testing/directive.py
  U   z3c.testing/trunk/src/z3c/testing/test.zcml
  U   z3c.testing/trunk/src/z3c/testing/tests.py

-=-
Modified: z3c.testing/trunk/CHANGES.txt
===================================================================
--- z3c.testing/trunk/CHANGES.txt	2009-12-26 15:30:58 UTC (rev 107096)
+++ z3c.testing/trunk/CHANGES.txt	2009-12-26 15:46:41 UTC (rev 107097)
@@ -5,26 +5,33 @@
 0.3.1 (unreleased)
 ------------------
 
-- ...
+- Removed install dependency on ``zope.app.security``.
 
+- Removed test dependency on ``zope.app.securitypolicy``.
+
+- Removed test dependency on ``zope.app.zcmlfiles``.
+
+
 0.3.0 (2009-02-01)
 ------------------
 
-- Use ``zope.container`` instead of ``zope.app.container``
-- Use ``zope.site`` instead of ``zope.app.component``
+- Using ``zope.container`` instead of ``zope.app.container``
 
+- Using ``zope.site`` instead of ``zope.app.component``
+
 0.2.0 (2007-10-31)
 ------------------
 
-- Fix pacakge data.
+- Fixed package data.
 
-- Move functional tests to tests.
+- Moved functional tests to tests.
 
-- Remove deprecation warning.
+- Removed deprecation warning.
 
 0.1.1b1 (2007-06-21)
 --------------------
 
-- make ``z3c`` a namespace
+- Make ``z3c`` a namespace.
 
-- prevent ``ConnectionStateError`` in layer after ``appsetup`` is run in layer
+- Prevent ``ConnectionStateError`` in layer after ``appsetup`` is run
+  in layer.

Modified: z3c.testing/trunk/setup.py
===================================================================
--- z3c.testing/trunk/setup.py	2009-12-26 15:30:58 UTC (rev 107096)
+++ z3c.testing/trunk/setup.py	2009-12-26 15:46:41 UTC (rev 107097)
@@ -47,16 +47,19 @@
       packages=find_packages('src'),
       package_dir = {'': 'src'},
       namespace_packages=['z3c'],
-      extras_require=dict(test=['zope.app.zcmlfiles',
-                                'zope.testbrowser',
-                                'zope.securitypolicy',
-                                'zope.app.securitypolicy',
-                                ]),
+      extras_require=dict(test=[
+          'zope.app.rotterdam',
+          'zope.browserpage',
+          'zope.browserresource',
+          'zope.principalregistry',
+          'zope.publisher',
+          'zope.securitypolicy',
+          'zope.testbrowser',
+          ]),
       install_requires = ['setuptools',
                           'ZODB3',
                           'zope.app.appsetup',
                           'zope.app.publication',
-                          'zope.app.security',
                           'zope.app.testing',
                           'zope.container',
                           'zope.site',

Modified: z3c.testing/trunk/src/z3c/testing/BROWSER.txt
===================================================================
--- z3c.testing/trunk/src/z3c/testing/BROWSER.txt	2009-12-26 15:30:58 UTC (rev 107096)
+++ z3c.testing/trunk/src/z3c/testing/BROWSER.txt	2009-12-26 15:46:41 UTC (rev 107097)
@@ -8,3 +8,5 @@
   >>> browser.open('http://localhost/++skin++Rotterdam/index.html')
   >>> browser.url
   'http://localhost/++skin++Rotterdam/index.html'
+  >>> print browser.contents
+  Example succeeded.
\ No newline at end of file

Modified: z3c.testing/trunk/src/z3c/testing/directive.py
===================================================================
--- z3c.testing/trunk/src/z3c/testing/directive.py	2009-12-26 15:30:58 UTC (rev 107096)
+++ z3c.testing/trunk/src/z3c/testing/directive.py	2009-12-26 15:46:41 UTC (rev 107097)
@@ -40,8 +40,8 @@
 # Zope (content) Meta Directives
 #-----------------------------------------------------------------------------
 import zope.component
-import zope.app.security
+import zope.security
 
 def setUpContentMetaDirectives():
     XMLConfig('meta.zcml', zope.component)()
-    XMLConfig('meta.zcml', zope.app.security)()
+    XMLConfig('meta.zcml', zope.security)()

Modified: z3c.testing/trunk/src/z3c/testing/test.zcml
===================================================================
--- z3c.testing/trunk/src/z3c/testing/test.zcml	2009-12-26 15:30:58 UTC (rev 107096)
+++ z3c.testing/trunk/src/z3c/testing/test.zcml	2009-12-26 15:46:41 UTC (rev 107097)
@@ -1,27 +1,42 @@
 <configure
     xmlns="http://namespaces.zope.org/zope"
-    xmlns:zcml="http://namespaces.zope.org/zcml">
+    xmlns:browser="http://namespaces.zope.org/browser">
 
-  <include package="zope.app.securitypolicy" file="meta.zcml" />
+  <include package="zope.component" file="meta.zcml" />
+  <include package="zope.security" file="meta.zcml" />
+  <include package="zope.principalregistry" file="meta.zcml" />
+  <include package="zope.securitypolicy" file="meta.zcml" />
+  <include package="zope.browserpage" file="meta.zcml" />
+  <include package="zope.app.publication" file="meta.zcml" />
+  <include package="zope.browserresource" file="meta.zcml" />
 
-  <include
-      zcml:condition="installed zope.app.zcmlfiles"
-      package="zope.app.zcmlfiles"
-      />
-  <include
-      zcml:condition="not-installed zope.app.zcmlfiles"
-      package="zope.app"
-      />
-
-  <include package="zope.app.securitypolicy" />
+  <include package="zope.app.rotterdam" />
+  <include package="zope.app.publication" />
+  <include package="zope.app.appsetup" />
+  <include package="zope.traversing" />
+  <include package="zope.container" />
+  <include package="zope.site" />
+  <include package="zope.annotation" />
+  <include package="zope.security" />
+  <include package="zope.principalregistry" />
+  <include package="zope.securitypolicy" />
   <securityPolicy
       component="zope.securitypolicy.zopepolicy.ZopeSecurityPolicy" />
 
   <unauthenticatedPrincipal
-    id="zope.anybody"
-    title="Unauthenticated User" />
+      id="zope.anybody"
+      title="Unauthenticated User" />
 
-  <grant permission="zope.View"
-         principal="zope.anybody" />
+  <grant
+      permission="zope.View"
+      principal="zope.anybody" />
 
+  <browser:page
+      for="zope.site.interfaces.IFolder"
+      name="index.html"
+      layer="zope.app.rotterdam.Rotterdam"
+      permission="zope.View"
+      class="z3c.testing.tests.ExamplePage"
+      />
+
 </configure>

Modified: z3c.testing/trunk/src/z3c/testing/tests.py
===================================================================
--- z3c.testing/trunk/src/z3c/testing/tests.py	2009-12-26 15:30:58 UTC (rev 107096)
+++ z3c.testing/trunk/src/z3c/testing/tests.py	2009-12-26 15:46:41 UTC (rev 107097)
@@ -48,6 +48,12 @@
         return ISample
 
 
+class ExamplePage(object):
+
+    def __call__(self):
+        return "Example succeeded."
+
+
 def test_suite():
     suite = unittest.TestSuite()
     # Unit Tests
@@ -62,6 +68,3 @@
         s.layer=MyLayer
         suite.addTest(s)
     return suite
-
-if __name__=='__main__':
-    unittest.main(defaultTest='test_suite')



More information about the checkins mailing list