[Checkins] SVN: zope.app.generations/trunk/ - ``zope.app.generations`` depended on ``zope.app.applicationcontrol`` but

[Michael Howitz]

Log message for revision 115808:
  - ``zope.app.generations`` depended on ``zope.app.applicationcontrol`` but
    did not declare it. Modernized dependecy to ``zope.applicationcontrol`` as
    the needed interface has been moved there.
  
  - Using python's ``doctest`` module instead of deprecated
    ``zope.testing.doctest[unit]``.
  
  

Changed:
  U   zope.app.generations/trunk/CHANGES.txt
  U   zope.app.generations/trunk/setup.py
  U   zope.app.generations/trunk/src/zope/app/generations/browser/configure.zcml
  U   zope.app.generations/trunk/src/zope/app/generations/browser/tests.py
  U   zope.app.generations/trunk/src/zope/app/generations/tests.py

-=-
Modified: zope.app.generations/trunk/CHANGES.txt
===================================================================
--- zope.app.generations/trunk/CHANGES.txt	2010-08-19 18:16:07 UTC (rev 115807)
+++ zope.app.generations/trunk/CHANGES.txt	2010-08-19 19:23:02 UTC (rev 115808)
@@ -2,12 +2,17 @@
 CHANGES
 =======
 
-3.5.2 (unreleased)
+3.6.0 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- ``zope.app.generations`` depended on ``zope.app.applicationcontrol`` but
+  did not declare it. Modernized dependecy to ``zope.applicationcontrol`` as
+  the needed interface has been moved there.
 
+- Using python's ``doctest`` module instead of deprecated
+  ``zope.testing.doctest[unit]``.
 
+
 3.5.1 (2010-01-08)
 ------------------
 

Modified: zope.app.generations/trunk/setup.py
===================================================================
--- zope.app.generations/trunk/setup.py	2010-08-19 18:16:07 UTC (rev 115807)
+++ zope.app.generations/trunk/setup.py	2010-08-19 19:23:02 UTC (rev 115808)
@@ -27,7 +27,7 @@
     return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
 
 setup(name='zope.app.generations',
-      version = '3.5.2dev',
+      version = '3.6.0dev',
       author='Zope Corporation and Contributors',
       author_email='zope-dev at zope.org',
       description='Zope Application Schema Generations',
@@ -70,6 +70,7 @@
                         'zope.app.publication',
                         'ZODB3',
                         'zope.processlifetime',
+                        'zope.applicationcontrol',
                         ],
       include_package_data = True,
       zip_safe = False,

Modified: zope.app.generations/trunk/src/zope/app/generations/browser/configure.zcml
===================================================================
--- zope.app.generations/trunk/src/zope/app/generations/browser/configure.zcml	2010-08-19 18:16:07 UTC (rev 115807)
+++ zope.app.generations/trunk/src/zope/app/generations/browser/configure.zcml	2010-08-19 19:23:02 UTC (rev 115808)
@@ -1,4 +1,4 @@
-<zope:configure 
+<zope:configure
    xmlns:zope="http://namespaces.zope.org/zope"
    xmlns="http://namespaces.zope.org/browser"
    >
@@ -6,7 +6,7 @@
 <page
     name="generations.html"
     menu="zmi_views" title="Database Schemas"
-    for="zope.app.applicationcontrol.interfaces.IApplicationControl"
+    for="zope.applicationcontrol.interfaces.IApplicationControl"
     class=".managers.Managers"
     template="managers.pt"
     permission="zope.ManageApplication"
@@ -14,7 +14,7 @@
 
 <page
     name="generations_managerdetails.html"
-    for="zope.app.applicationcontrol.interfaces.IApplicationControl"
+    for="zope.applicationcontrol.interfaces.IApplicationControl"
     class=".managerdetails.ManagerDetails"
     template="managerdetails.pt"
     permission="zope.ManageApplication"

Modified: zope.app.generations/trunk/src/zope/app/generations/browser/tests.py
===================================================================
--- zope.app.generations/trunk/src/zope/app/generations/browser/tests.py	2010-08-19 18:16:07 UTC (rev 115807)
+++ zope.app.generations/trunk/src/zope/app/generations/browser/tests.py	2010-08-19 19:23:02 UTC (rev 115808)
@@ -16,7 +16,7 @@
 $Id$
 """
 import unittest
-from zope.testing.doctestunit import DocTestSuite
+import doctest
 from zope.app.generations.testing import GenerationsLayer
 from zope.app.testing import ztapi, functional
 from zope.app.generations.generations import SchemaManager, generations_key
@@ -82,8 +82,8 @@
 def test_suite():
     TestDatabaseSchema.layer = GenerationsLayer
     return unittest.TestSuite((
-        DocTestSuite('zope.app.generations.browser.managers'),
-        DocTestSuite('zope.app.generations.browser.managerdetails'),
+        doctest.DocTestSuite('zope.app.generations.browser.managers'),
+        doctest.DocTestSuite('zope.app.generations.browser.managerdetails'),
         unittest.makeSuite(TestDatabaseSchema),
         ))
 

Modified: zope.app.generations/trunk/src/zope/app/generations/tests.py
===================================================================
--- zope.app.generations/trunk/src/zope/app/generations/tests.py	2010-08-19 18:16:07 UTC (rev 115807)
+++ zope.app.generations/trunk/src/zope/app/generations/tests.py	2010-08-19 19:23:02 UTC (rev 115808)
@@ -16,9 +16,9 @@
 $Id$
 """
 
+from zope.app.testing import placelesssetup
+import doctest
 import unittest
-from zope.testing import doctest
-from zope.app.testing import placelesssetup
 
 
 def tearDownREADME(test):