[Checkins] SVN: zope.app.dtmlpage/trunk/ Reduced the dependency of zope.app.dtmlpage upon zope.app.container to

[Brandon Rhodes]

Log message for revision 95502:
  Reduced the dependency of zope.app.dtmlpage upon zope.app.container to
  be a simpler dependency upon zope.container.
  

Changed:
  _U  zope.app.dtmlpage/trunk/
  U   zope.app.dtmlpage/trunk/CHANGES.txt
  U   zope.app.dtmlpage/trunk/buildout.cfg
  U   zope.app.dtmlpage/trunk/setup.py
  U   zope.app.dtmlpage/trunk/src/zope/app/dtmlpage/dtmlpage.py
  U   zope.app.dtmlpage/trunk/src/zope/app/dtmlpage/tests/test_dtmlpage.py
  U   zope.app.dtmlpage/trunk/src/zope/app/dtmlpage/tests/test_dtmlpageeval.py

-=-

Property changes on: zope.app.dtmlpage/trunk
___________________________________________________________________
Added: svn:externals
   + zope.container svn://svn.zope.org/repos/main/zope.container/trunk
zope.app.container svn://svn.zope.org/repos/main/zope.app.container/trunk


Modified: zope.app.dtmlpage/trunk/CHANGES.txt
===================================================================
--- zope.app.dtmlpage/trunk/CHANGES.txt	2009-01-29 18:58:00 UTC (rev 95501)
+++ zope.app.dtmlpage/trunk/CHANGES.txt	2009-01-29 18:58:08 UTC (rev 95502)
@@ -2,6 +2,13 @@
 CHANGES
 =======
 
+3.5.0 (unreleased)
+------------------
+
+- Reduced the dependency upon `zope.app.container` to be simply a
+  dependency upon `zope.container`.
+
+
 3.4.1 (2007-10-31)
 ------------------
 

Modified: zope.app.dtmlpage/trunk/buildout.cfg
===================================================================
--- zope.app.dtmlpage/trunk/buildout.cfg	2009-01-29 18:58:00 UTC (rev 95501)
+++ zope.app.dtmlpage/trunk/buildout.cfg	2009-01-29 18:58:08 UTC (rev 95502)
@@ -1,5 +1,5 @@
 [buildout]
-develop = .
+develop = . zope.container zope.app.container
 parts = test
 
 [test]

Modified: zope.app.dtmlpage/trunk/setup.py
===================================================================
--- zope.app.dtmlpage/trunk/setup.py	2009-01-29 18:58:00 UTC (rev 95501)
+++ zope.app.dtmlpage/trunk/setup.py	2009-01-29 18:58:08 UTC (rev 95502)
@@ -22,7 +22,7 @@
     return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
 
 setup(name = 'zope.app.dtmlpage',
-      version = '3.4.1',
+      version = '3.5.0dev',
       author='Zope Corporation and Contributors',
       author_email='zope3-dev at zope.org',
       description='DTML Page -- A Zope 3 Content Component',
@@ -54,10 +54,10 @@
       install_requires = ['setuptools',
                           'ZODB3',
                           'zope.annotation',
-                          'zope.app.container',
                           'zope.app.publication',
                           'zope.app.preview',
                           'zope.app.testing',
+                          'zope.container',
                           'zope.documenttemplate',
                           'zope.filerepresentation',
                           'zope.interface',

Modified: zope.app.dtmlpage/trunk/src/zope/app/dtmlpage/dtmlpage.py
===================================================================
--- zope.app.dtmlpage/trunk/src/zope/app/dtmlpage/dtmlpage.py	2009-01-29 18:58:00 UTC (rev 95501)
+++ zope.app.dtmlpage/trunk/src/zope/app/dtmlpage/dtmlpage.py	2009-01-29 18:58:08 UTC (rev 95502)
@@ -24,7 +24,7 @@
 from zope.annotation.interfaces import IAnnotatable
 from zope.filerepresentation.interfaces import IFileFactory
 
-from zope.app.container.contained import Contained
+from zope.container.contained import Contained
 from zope.app.publication.interfaces import IFileContent
 
 from interfaces import IDTMLPage, IRenderDTMLPage

Modified: zope.app.dtmlpage/trunk/src/zope/app/dtmlpage/tests/test_dtmlpage.py
===================================================================
--- zope.app.dtmlpage/trunk/src/zope/app/dtmlpage/tests/test_dtmlpage.py	2009-01-29 18:58:00 UTC (rev 95501)
+++ zope.app.dtmlpage/trunk/src/zope/app/dtmlpage/tests/test_dtmlpage.py	2009-01-29 18:58:08 UTC (rev 95502)
@@ -23,7 +23,7 @@
 
 from zope.app.testing.placelesssetup import PlacelessSetup
 from zope.app.testing import ztapi
-from zope.app.container.contained import contained
+from zope.container.contained import contained
 from zope.app.dtmlpage.dtmlpage import DTMLPage
 
 

Modified: zope.app.dtmlpage/trunk/src/zope/app/dtmlpage/tests/test_dtmlpageeval.py
===================================================================
--- zope.app.dtmlpage/trunk/src/zope/app/dtmlpage/tests/test_dtmlpageeval.py	2009-01-29 18:58:00 UTC (rev 95501)
+++ zope.app.dtmlpage/trunk/src/zope/app/dtmlpage/tests/test_dtmlpageeval.py	2009-01-29 18:58:08 UTC (rev 95502)
@@ -16,7 +16,7 @@
 $Id$
 """
 from unittest import TestCase, main, makeSuite
-from zope.app.container.contained import contained
+from zope.container.contained import contained
 from zope.app.dtmlpage.browser import DTMLPageEval
 
 class Test(TestCase):