[Checkins] SVN: zope.app.security/trunk/ Cleanup dependencies after refactorings. Don't depend on zope.app.testing for tests anymore.

[Dan Korostelev]

Log message for revision 97977:
  Cleanup dependencies after refactorings. Don't depend on zope.app.testing for tests anymore.
  Fix typo in CHANGES.txt.
  

Changed:
  U   zope.app.security/trunk/CHANGES.txt
  U   zope.app.security/trunk/buildout.cfg
  U   zope.app.security/trunk/setup.py
  U   zope.app.security/trunk/src/zope/app/security/browser/loginlogout.txt
  U   zope.app.security/trunk/src/zope/app/security/browser/tests.py
  U   zope.app.security/trunk/src/zope/app/security/tests/test_permission.py
  U   zope.app.security/trunk/src/zope/app/security/tests/test_principallogging.py

-=-
Modified: zope.app.security/trunk/CHANGES.txt
===================================================================
--- zope.app.security/trunk/CHANGES.txt	2009-03-12 09:59:37 UTC (rev 97976)
+++ zope.app.security/trunk/CHANGES.txt	2009-03-12 10:12:55 UTC (rev 97977)
@@ -29,7 +29,7 @@
   zope.security now knows about i18n messages and __name__ and __parent__
   attributes and won't protect them by default.
 
-- The addCheckerPublic was moved from zope.app.testing.tests to
+- The addCheckerPublic was moved from zope.app.security.tests to
   zope.security.testing. Backward-compatibility import is provided.
 
 - The ``LocalPermission`` class is now moved to new ``zope.localpermission``
@@ -41,6 +41,9 @@
   `browser/configure.zcml`. This adds a possibility to exclude ZMI-related
   configuration for local permissions.
 
+- Cleanup dependencies after refactorings. Also, don't depend on
+  zope.app.testing for tests anymore.
+
 3.6.2 (2009-03-10)
 ------------------
 

Modified: zope.app.security/trunk/buildout.cfg
===================================================================
--- zope.app.security/trunk/buildout.cfg	2009-03-12 09:59:37 UTC (rev 97976)
+++ zope.app.security/trunk/buildout.cfg	2009-03-12 10:12:55 UTC (rev 97977)
@@ -2,24 +2,21 @@
 parts = test  coverage-test coverage-report
 develop = .
   ../zope.authentication
+  ../zope.component
   ../zope.localpermission
   ../zope.publisher
   ../zope.principalregistry
   ../zope.security
-    
-  ../zope.component
-  ../zope.app.testing
-  ../zope.container
   ../zope.app.publisher
 # these are needed until we get new zope.component released
 
 [test]
 recipe = zc.recipe.testrunner
-eggs = zope.app.security [test]
+eggs = zope.app.security
 
 [coverage-test]
 recipe = zc.recipe.testrunner
-eggs = zope.app.security [test]
+eggs = zope.app.security
 defaults = ['--coverage', '../../coverage']
 
 [coverage-report]

Modified: zope.app.security/trunk/setup.py
===================================================================
--- zope.app.security/trunk/setup.py	2009-03-12 09:59:37 UTC (rev 97976)
+++ zope.app.security/trunk/setup.py	2009-03-12 10:12:55 UTC (rev 97977)
@@ -55,27 +55,19 @@
       packages=find_packages('src'),
       package_dir = {'': 'src'},
       namespace_packages=['zope', 'zope.app'],
-      extras_require=dict(test=['zope.app.testing']),
       install_requires=['setuptools',
-                        'zope.browser',
-                        'zope.app.component',
                         'zope.app.form',
                         'zope.app.pagetemplate',
                         'zope.app.publisher',
                         'zope.authentication',
                         'zope.component',
-                        'zope.configuration',
-                        'zope.container',
                         'zope.i18n',
                         'zope.i18nmessageid',
                         'zope.interface',
                         'zope.localpermission',
                         'zope.principalregistry',
-                        'zope.password',
                         'zope.publisher',
-                        'zope.schema',
                         'zope.security',
-                        'zope.site',
                         'ZODB3',
                         ],
       include_package_data = True,

Modified: zope.app.security/trunk/src/zope/app/security/browser/loginlogout.txt
===================================================================
--- zope.app.security/trunk/src/zope/app/security/browser/loginlogout.txt	2009-03-12 09:59:37 UTC (rev 97976)
+++ zope.app.security/trunk/src/zope/app/security/browser/loginlogout.txt	2009-03-12 10:12:55 UTC (rev 97977)
@@ -61,8 +61,8 @@
 adapter that can be registered for this:
 
   >>> from zope.authentication.logout import LogoutSupported
-  >>> from zope.app.testing import ztapi
-  >>> ztapi.provideAdapter(None, ILogoutSupported, LogoutSupported)
+  >>> from zope.component import provideAdapter
+  >>> provideAdapter(LogoutSupported, (None,), ILogoutSupported)
 
 Now when we use LoginLogout with an unauthenticated principal, we get a logout
 prompt:

Modified: zope.app.security/trunk/src/zope/app/security/browser/tests.py
===================================================================
--- zope.app.security/trunk/src/zope/app/security/browser/tests.py	2009-03-12 09:59:37 UTC (rev 97976)
+++ zope.app.security/trunk/src/zope/app/security/browser/tests.py	2009-03-12 10:12:55 UTC (rev 97977)
@@ -18,7 +18,6 @@
 __docformat__ = "reStructuredText"
 import unittest
 from zope.testing import doctest
-from zope.app.testing import placelesssetup
 
 def test_bbb_imports():
     """
@@ -35,10 +34,6 @@
 def test_suite():
     return unittest.TestSuite((
         doctest.DocTestSuite(),
-        doctest.DocFileSuite('authutilitysearchview.txt',
-                             setUp=placelesssetup.setUp,
-                             tearDown=placelesssetup.tearDown),
-        doctest.DocFileSuite('loginlogout.txt',
-                             setUp=placelesssetup.setUp,
-                             tearDown=placelesssetup.tearDown),
+        doctest.DocFileSuite('authutilitysearchview.txt'),
+        doctest.DocFileSuite('loginlogout.txt'),
         ))

Modified: zope.app.security/trunk/src/zope/app/security/tests/test_permission.py
===================================================================
--- zope.app.security/trunk/src/zope/app/security/tests/test_permission.py	2009-03-12 09:59:37 UTC (rev 97976)
+++ zope.app.security/trunk/src/zope/app/security/tests/test_permission.py	2009-03-12 10:12:55 UTC (rev 97977)
@@ -16,7 +16,7 @@
 $Id$
 """
 import unittest
-import doctest
+from zope.testing import doctest
 
 def test_bbb_imports():
     """

Modified: zope.app.security/trunk/src/zope/app/security/tests/test_principallogging.py
===================================================================
--- zope.app.security/trunk/src/zope/app/security/tests/test_principallogging.py	2009-03-12 09:59:37 UTC (rev 97976)
+++ zope.app.security/trunk/src/zope/app/security/tests/test_principallogging.py	2009-03-12 10:12:55 UTC (rev 97977)
@@ -16,7 +16,7 @@
 $Id$
 """
 import unittest
-from zope.testing.doctestunit import DocTestSuite
+from zope.testing import doctest
 
 def test_bbb_imports():
     """
@@ -32,8 +32,5 @@
 
 def test_suite():
     return unittest.TestSuite((
-        DocTestSuite(),
+        doctest.DocTestSuite(),
         ))
-
-if __name__ == '__main__':
-    unittest.main(defaultTest='test_suite')