[Checkins] SVN: z3c.testing/trunk/ adapt to newer packages

[Dan Korostelev]

Log message for revision 95902:
  adapt to newer packages

Changed:
  U   z3c.testing/trunk/CHANGES.txt
  U   z3c.testing/trunk/setup.py
  U   z3c.testing/trunk/src/z3c/testing/app.py
  U   z3c.testing/trunk/src/z3c/testing/generation.py
  U   z3c.testing/trunk/src/z3c/testing/layer.py

-=-
Modified: z3c.testing/trunk/CHANGES.txt
===================================================================
--- z3c.testing/trunk/CHANGES.txt	2009-02-01 17:52:49 UTC (rev 95901)
+++ z3c.testing/trunk/CHANGES.txt	2009-02-01 18:20:26 UTC (rev 95902)
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+0.3.0 (unreleased)
+------------------
+
+- Use ``zope.container`` instead of ``zope.app.container``
+- Use ``zope.site`` instead of ``zope.app.component``
+
 0.2.0 (2007-10-31)
 ------------------
 

Modified: z3c.testing/trunk/setup.py
===================================================================
--- z3c.testing/trunk/setup.py	2009-02-01 17:52:49 UTC (rev 95901)
+++ z3c.testing/trunk/setup.py	2009-02-01 18:20:26 UTC (rev 95902)
@@ -22,9 +22,9 @@
     return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
 
 setup(name='z3c.testing',
-      version = '0.3.0',
+      version = '0.3.0dev',
       author='Zope Corporation and Contributors',
-      author_email='zope3-dev at zope.org',
+      author_email='zope-dev at zope.org',
       description='High-level Testing Support',
       long_description=(
           read('README.txt')
@@ -42,7 +42,7 @@
           'Operating System :: OS Independent',
           'Topic :: Internet :: WWW/HTTP',
           'Framework :: Zope3'],
-      url='http://cheeseshop.python.org/pypi/z3c.testing',
+      url='http://pypi.python.org/pypi/z3c.testing',
       license='ZPL 2.1',
       packages=find_packages('src'),
       package_dir = {'': 'src'},
@@ -55,11 +55,11 @@
       install_requires = ['setuptools',
                           'ZODB3',
                           'zope.app.appsetup',
-                          'zope.app.container',
-                          'zope.app.folder',
                           'zope.app.publication',
                           'zope.app.security',
                           'zope.app.testing',
+                          'zope.container',
+                          'zope.site',
                           'zope.component',
                           'zope.configuration',
                           'zope.interface',

Modified: z3c.testing/trunk/src/z3c/testing/app.py
===================================================================
--- z3c.testing/trunk/src/z3c/testing/app.py	2009-02-01 17:52:49 UTC (rev 95901)
+++ z3c.testing/trunk/src/z3c/testing/app.py	2009-02-01 18:20:26 UTC (rev 95902)
@@ -88,8 +88,8 @@
 #
 ###############################################################################
 
-from zope.app.container.tests.test_icontainer import BaseTestIContainer as BTIC
-from zope.app.container.tests.test_icontainer import DefaultTestData
+from zope.container.tests.test_icontainer import BaseTestIContainer as BTIC
+from zope.container.tests.test_icontainer import DefaultTestData
 
 
 class BaseTestIContainer(InterfaceBaseTest, BTIC):

Modified: z3c.testing/trunk/src/z3c/testing/generation.py
===================================================================
--- z3c.testing/trunk/src/z3c/testing/generation.py	2009-02-01 17:52:49 UTC (rev 95901)
+++ z3c.testing/trunk/src/z3c/testing/generation.py	2009-02-01 18:20:26 UTC (rev 95902)
@@ -16,7 +16,7 @@
 from zope.testing import doctest
 from zope.app.publication.zopepublication import ZopePublication
 from zope.app.testing import setup
-from zope.app.folder.folder import rootFolder
+from zope.site.folder import rootFolder
 
 
 ###############################################################################

Modified: z3c.testing/trunk/src/z3c/testing/layer.py
===================================================================
--- z3c.testing/trunk/src/z3c/testing/layer.py	2009-02-01 17:52:49 UTC (rev 95901)
+++ z3c.testing/trunk/src/z3c/testing/layer.py	2009-02-01 18:20:26 UTC (rev 95902)
@@ -29,7 +29,7 @@
 from zope.app.testing import functional
 from zope.app.publication.zopepublication import ZopePublication
 import sys
-from zope.app.component import hooks
+from zope.site import hooks
 
 class BufferedDatabaseTestLayer(object):
     """A test layer which creates a filestorage database.