[Checkins] SVN: zope.app.zptpage/trunk/ Switch over to zope.container.

[Martijn Faassen]

Log message for revision 95489:
  Switch over to zope.container.
  

Changed:
  U   zope.app.zptpage/trunk/CHANGES.txt
  U   zope.app.zptpage/trunk/setup.py
  U   zope.app.zptpage/trunk/src/zope/app/zptpage/tests/test_zptpage.py
  U   zope.app.zptpage/trunk/src/zope/app/zptpage/tests/test_zptpageeval.py
  U   zope.app.zptpage/trunk/src/zope/app/zptpage/zptpage.py

-=-
Modified: zope.app.zptpage/trunk/CHANGES.txt
===================================================================
--- zope.app.zptpage/trunk/CHANGES.txt	2009-01-29 18:36:54 UTC (rev 95488)
+++ zope.app.zptpage/trunk/CHANGES.txt	2009-01-29 18:38:14 UTC (rev 95489)
@@ -2,6 +2,11 @@
 CHANGES
 =======
 
+3.5 (unreleased)
+----------------
+
+- Use zope.container instead of zope.app.container.
+
 3.4.1 (2007-10-31)
 ------------------
 

Modified: zope.app.zptpage/trunk/setup.py
===================================================================
--- zope.app.zptpage/trunk/setup.py	2009-01-29 18:36:54 UTC (rev 95488)
+++ zope.app.zptpage/trunk/setup.py	2009-01-29 18:38:14 UTC (rev 95489)
@@ -25,7 +25,7 @@
 
 setup(
     name='zope.app.zptpage',
-    version='3.5.0dev',
+    version='3.5dev',
     url='http://pypi.python.org/pypi/zope.app.zptpage',
     author='Zope Corporation and Contributors',
     author_email='zope3-dev at zope.org',
@@ -51,7 +51,7 @@
     namespace_packages=['zope', 'zope.app'],
     include_package_data=True,
     install_requires=['setuptools',
-                      'zope.app.container',
+                      'zope.container',
                       'zope.app.pagetemplate',
                       'zope.app.publication',
                       'zope.filerepresentation',

Modified: zope.app.zptpage/trunk/src/zope/app/zptpage/tests/test_zptpage.py
===================================================================
--- zope.app.zptpage/trunk/src/zope/app/zptpage/tests/test_zptpage.py	2009-01-29 18:36:54 UTC (rev 95488)
+++ zope.app.zptpage/trunk/src/zope/app/zptpage/tests/test_zptpage.py	2009-01-29 18:38:14 UTC (rev 95489)
@@ -32,7 +32,7 @@
 
 from zope.app.testing import ztapi
 from zope.app.testing.placelesssetup import PlacelessSetup
-from zope.app.container.contained import contained
+from zope.container.contained import contained
 
 from zope.app.zptpage.interfaces import IZPTPage
 from zope.app.zptpage.zptpage import ZPTPage, ZPTSourceView,\

Modified: zope.app.zptpage/trunk/src/zope/app/zptpage/tests/test_zptpageeval.py
===================================================================
--- zope.app.zptpage/trunk/src/zope/app/zptpage/tests/test_zptpageeval.py	2009-01-29 18:36:54 UTC (rev 95488)
+++ zope.app.zptpage/trunk/src/zope/app/zptpage/tests/test_zptpageeval.py	2009-01-29 18:38:14 UTC (rev 95489)
@@ -17,7 +17,7 @@
 """
 from unittest import TestCase, main, makeSuite
 from zope.testing.cleanup import CleanUp # Base class w registry cleanup
-from zope.app.container.contained import contained
+from zope.container.contained import contained
 from zope.app.zptpage.browser.zptpage import ZPTPageEval
 
 class Test(CleanUp, TestCase):

Modified: zope.app.zptpage/trunk/src/zope/app/zptpage/zptpage.py
===================================================================
--- zope.app.zptpage/trunk/src/zope/app/zptpage/zptpage.py	2009-01-29 18:36:54 UTC (rev 95488)
+++ zope.app.zptpage/trunk/src/zope/app/zptpage/zptpage.py	2009-01-29 18:38:14 UTC (rev 95489)
@@ -28,7 +28,7 @@
 
 from zope.app.pagetemplate.engine import AppPT
 from zope.app.zptpage.i18n import ZopeMessageFactory as _
-from zope.app.container.contained import Contained
+from zope.container.contained import Contained
 from zope.app.publication.interfaces import IFileContent
 from zope.app.zptpage.interfaces import IZPTPage, IRenderZPTPage