rename zope.app.container to zope.container

buildout.cfg

@@ -4,5 +4,5 @@ parts = test
 
 [test]
 recipe = zc.recipe.testrunner
-eggs = zope.app.container [test]
+eggs = zope.container [test]
 

setup.py

@@ -11,7 +11,7 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-"""Setup for zope.app.container package
+"""Setup for zope.container package
 
 $Id$
 """
@@ -21,7 +21,7 @@ from setuptools import setup, find_packages, Extension
 def read(*rnames):
     return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
 
-setup(name='zope.app.container',
+setup(name='zope.container',
       version = '3.7.0dev',
       author='Zope Corporation and Contributors',
       author_email='zope-dev@zope.org',
@@ -32,7 +32,7 @@ setup(name='zope.app.container',
           'Detailed Documentation\n'
           '**********************\n'
           + '\n\n' +
-          read('src', 'zope', 'app', 'container', 'constraints.txt')
+          read('src', 'zope', 'container', 'constraints.txt')
           + '\n\n' +
           read('CHANGES.txt')
           ),
@@ -45,22 +45,21 @@ setup(name='zope.app.container',
           'Programming Language :: Python',
           'Natural Language :: English',
           'Operating System :: OS Independent',
+
           'Topic :: Internet :: WWW/HTTP',
           'Framework :: Zope3'],
-      url='http://cheeseshop.python.org/pypi/zope.app.container',
+      url='http://cheeseshop.python.org/pypi/zope.container',
       license='ZPL 2.1',
       packages=find_packages('src'),
       package_dir = {'': 'src'},
-      namespace_packages=['zope', 'zope.app'],
-      ext_modules=[Extension("zope.app.container._zope_app_container_contained",
-                             [os.path.join("src", "zope", "app", "container",
-                                           "_zope_app_container_contained.c")
+      namespace_packages=['zope'],
+      ext_modules=[Extension("zope.container._zope_container_contained",
+                             [os.path.join("src", "zope", "container",
+                                           "_zope_container_contained.c")
                               ], include_dirs=['include']),
                    ],
 
       extras_require=dict(test=['zope.app.testing',
-                                'zope.app.securitypolicy',
-                                'zope.app.zcmlfiles',
                                 'zope.app.file']),
       install_requires=['setuptools',
                         'zope.interface',

src/zope/container/_zope_container_contained.c

@@ -12,7 +12,7 @@
 #
 ############################################################################*/
 
-#define _ZOPE_APP_CONTAINER_CONTAINED_C "$Id$\n"
+#define _ZOPE_CONTAINER_CONTAINED_C "$Id$\n"
 
 /* Contained Proxy Base class
 
@@ -291,7 +291,7 @@ CP_dealloc(ProxyObject *self)
 #define PyMODINIT_FUNC void
 #endif
 PyMODINIT_FUNC
-init_zope_app_container_contained(void)
+init_zope_container_contained(void)
 {
   PyObject *m;
 
@@ -302,7 +302,7 @@ init_zope_app_container_contained(void)
   /* Try to fake out compiler nag function */
   if (0) init_zope_proxy_proxy();
   
-  m = Py_InitModule3("_zope_app_container_contained", 
+  m = Py_InitModule3("_zope_container_contained", 
                      module_functions, module___doc__);
 
   if (m == NULL)
@@ -316,7 +316,7 @@ init_zope_app_container_contained(void)
   if (cPersistenceCAPI == NULL)
     return;
 
-  ProxyType.tp_name = "zope.app.container.contained.ContainedProxyBase";
+  ProxyType.tp_name = "zope.container.contained.ContainedProxyBase";
   ProxyType.ob_type = &PyType_Type;
   ProxyType.tp_base = cPersistenceCAPI->pertype;
   ProxyType.tp_getattro = CP_getattro;

src/zope/container/contained.py

@@ -36,8 +36,8 @@ from zope.container.interfaces import IObjectAddedEvent
 from zope.container.interfaces import IObjectMovedEvent
 from zope.container.interfaces import IObjectRemovedEvent
 from zope.container.interfaces import IContainerModifiedEvent
-from zope.container._zope_app_container_contained import ContainedProxyBase
-from zope.container._zope_app_container_contained import getProxiedObject
+from zope.container._zope_container_contained import ContainedProxyBase
+from zope.container._zope_container_contained import getProxiedObject
 from zope.app.broken.interfaces import IBroken
 
 class Contained(object):