Python 3 port.

Breaks dependency on zope.app.testing and zope.app.zcmlfiles and
zope.app.component.

- Replace all uses of assert_ with more specific method.
- Append :list to appropriate parameter names to account for
  differences in zope.app.testing and zope.app.wsgi.
- Use zope.testing.cleanup to tear down things like interactions, if
  needed.

.coveragerc

@@ -0,0 +1,6 @@
+[run]
+source = src
+
+[report]
+exclude_lines =
+    pragma: no cover

.travis.yml

@@ -1,9 +1,22 @@
 language: python
+sudo: false
 python:
     - 2.7
+    - pypy-5.4.1
+    - 3.4
+    - 3.5
+    - 3.6
 install:
-    - pip install .
+    - pip install -U pip setuptools
+    - pip install -U coverage coveralls
+    - pip install -e  git+https://github.com/zopefoundation/zope.proxy.git@issue15#egg=zope.proxy
+    - pip install -U -e .[test]
 script:
-    - python setup.py test -q
+  - coverage run -m zope.testrunner --test-path=src  --auto-color --auto-progress
 notifications:
     email: false
+after_success:
+    - coveralls
+cache: pip
+before_cache:
+    - rm -f $HOME/.cache/pip/log/debug.log

CHANGES.txt → CHANGES.rst

@@ -2,6 +2,11 @@
 CHANGES
 =======
 
+4.0.0 (unreleased)
+------------------
+
+- Added support for PyPy and Python 3.4, 3.5 and 3.6.
+
 3.9.2 (2012-01-23)
 ------------------
 

MANIFEST.in

@@ -1,5 +1,6 @@
 include *.py
 include *.txt
+include *.rst
 include buildout.cfg
 recursive-include src *.pt
 recursive-include src *.txt

setup.cfg

@@ -0,0 +1,2 @@
+[bdist_wheel]
+universal = 1

setup.py

@@ -13,70 +13,99 @@
 ##############################################################################
 """Setup for zope.app.container package
 
-$Id$
 """
 import os
 from setuptools import setup, find_packages
 
 def read(*rnames):
-    return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
+    with open(os.path.join(os.path.dirname(__file__), *rnames)) as f:
+        return f.read()
+
+version = '4.0.0.dev0'
 
 setup(name='zope.app.container',
-      version='3.9.2',
+      version=version,
       author='Zope Corporation and Contributors',
       author_email='zope-dev@zope.org',
       description='Zope Container',
       long_description=(
-          read('README.txt')
+          read('README.rst')
           + '\n\n' +
-          read('CHANGES.txt')
+          read('CHANGES.rst')
           ),
-      keywords = "zope3 container",
-      classifiers = [
+      keywords="zope3 container",
+      classifiers=[
           'Development Status :: 5 - Production/Stable',
           'Environment :: Web Environment',
           'Intended Audience :: Developers',
           'License :: OSI Approved :: Zope Public License',
           'Programming Language :: Python',
+          'Programming Language :: Python :: 2.7',
+          'Programming Language :: Python :: 3.4',
+          'Programming Language :: Python :: 3.5',
+          'Programming Language :: Python :: 3.6',
+          'Programming Language :: Python :: Implementation :: CPython',
+          'Programming Language :: Python :: Implementation :: PyPy',
           'Natural Language :: English',
           'Operating System :: OS Independent',
           'Topic :: Internet :: WWW/HTTP',
-          'Framework :: Zope3'],
-      url='http://cheeseshop.python.org/pypi/zope.app.container',
+          'Framework :: Zope3',
+      ],
+      url='http://github.com/zopefoundation/zope.app.container',
       license='ZPL 2.1',
       packages=find_packages('src'),
       package_dir = {'': 'src'},
       namespace_packages=['zope', 'zope.app'],
+      extras_require={
+          'test': [
+              'zope.app.appsetup',
+              'zope.app.basicskin >= 4.0',
+              'zope.app.content',
+              'zope.app.dependable >= 4.0',
+              'zope.app.http',
+              'zope.app.pagetemplate >= 4.0',
+              'zope.app.principalannotation',
+              'zope.app.publication',
+              'zope.app.publisher',
+              'zope.app.security',
+              'zope.app.testing',
+              'zope.app.wsgi',
 
-      extras_require=dict(test=['zope.app.testing',
-                                'zope.app.zcmlfiles',
-                                'zope.login',
-                                'zope.password',
-                                'zope.securitypolicy',
-                                'zope.schema',
-                                'zope.site',
-                                ]),
-      install_requires=['setuptools',
-                        'zope.browser',
-                        'zope.browsermenu',
-                        'zope.browserpage',
-                        'zope.component',
-                        'zope.container',
-                        'zope.copypastemove',
-                        'zope.dublincore >= 3.7',
-                        'zope.event',
-                        'zope.exceptions',
-                        'zope.i18n',
-                        'zope.i18nmessageid',
-                        'zope.interface',
-                        'zope.lifecycleevent',
-                        'zope.location',
-                        'zope.publisher >= 3.12',
-                        'zope.security',
-                        'zope.size',
-                        'zope.traversing',
-                        ],
-      include_package_data = True,
-      zip_safe = False,
+              'zope.applicationcontrol',
+              'zope.browser',
+              'zope.browserresource',
+              'zope.copypastemove',
+              'zope.login',
+              'zope.password',
+              'zope.principalannotation',
+              'zope.principalregistry',
+              'zope.securitypolicy',
+              'zope.site',
+              'zope.testbrowser>5',
+              'zope.testing',
+              'zope.testrunner',
+      ]},
+      install_requires=[
+          'setuptools',
+          'zope.browser',
+          'zope.browsermenu',
+          'zope.browserpage',
+          'zope.component',
+          'zope.container',
+          'zope.copypastemove',
+          'zope.dublincore >= 3.7',
+          'zope.event',
+          'zope.exceptions',
+          'zope.i18n',
+          'zope.i18nmessageid',
+          'zope.interface',
+          'zope.lifecycleevent',
+          'zope.location',
+          'zope.publisher >= 3.12',
+          'zope.security',
+          'zope.size',
+          'zope.traversing',
+      ],
+      include_package_data=True,
+      zip_safe=False,
       )
-

src/zope/app/container/browser/adding.py

@@ -38,7 +38,7 @@
 from zope.exceptions.interfaces import UserError
 from zope.i18n.interfaces.locales import ICollator
 from zope.i18n.locales.fallbackcollator import FallbackCollator
-from zope.interface import implements
+from zope.interface import implementer
 from zope.lifecycleevent import ObjectCreatedEvent
 from zope.location import LocationProxy
 from zope.publisher.browser import BrowserView
@@ -47,8 +47,9 @@
 from zope.traversing.browser.absoluteurl import absoluteURL
 import zope.security.checker
 
+@implementer(IAdding, IPublishTraverse)
 class Adding(BrowserView):
-    implements(IAdding, IPublishTraverse)
+
 
     def add(self, content):
         """See zope.app.container.interfaces.IAdding

src/zope/app/container/browser/contents.py

@@ -15,7 +15,8 @@
 """
 __docformat__ = 'restructuredtext'
 
-import urllib
+import six
+from six.moves import urllib_parse as urllib
 
 from zope.component import queryMultiAdapter
 from zope.event import notify
@@ -117,7 +118,7 @@ def _normalListContentsInfo(self):
                  )
         self.normalButtons = not self.specialButtons
 
-        info = map(self._extractContentInfo, self.context.items())
+        info = [self._extractContentInfo(x) for x in self.context.items()]
 
         self.supportsCut = info
         self.supportsCopy = info
@@ -261,6 +262,7 @@ def copyObjects(self):
         """Copy objects specified in a list of object ids"""
         request = self.request
         ids = request.get('ids')
+
         if not ids:
             self.error = _("You didn't specify any ids to copy.")
             return
@@ -301,7 +303,8 @@ def cutObjects(self):
         if not ids:
             self.error = _("You didn't specify any ids to cut.")
             return
-
+        if isinstance(ids, six.string_types):
+            ids = [ids]
         container_path = getPath(self.context)
 
         # For each item, check that it can be moved; if so, save the

src/zope/app/container/browser/tests/__init__.py

@@ -1,2 +1,39 @@
 #
-# This file is necessary to make this directory a package.
+
+import unittest
+
+from webtest import TestApp
+
+from zope import component
+
+def provideAdapter(required, provided, factory):
+    gsm = component.getGlobalSiteManager()
+    gsm.registerAdapter(factory, [required], provided, event=False)
+
+
+class BrowserTestCase(unittest.TestCase):
+
+    def getRootFolder(self):
+        return self.layer.getRootFolder()
+
+    def setUp(self):
+        super(BrowserTestCase, self).setUp()
+        self._testapp = TestApp(self.layer.make_wsgi_app())
+        # Typically this would be done by zope.app.principalannotation's
+        # bootstrap.zcml but we don't have a dep on that.
+        from zope.principalannotation.utility import PrincipalAnnotationUtility
+        from zope.principalannotation.interfaces import IPrincipalAnnotationUtility
+        component.getGlobalSiteManager().registerUtility(PrincipalAnnotationUtility(),
+                                                         IPrincipalAnnotationUtility)
+
+    def publish(self, path, basic=None, form=None):
+        if basic:
+            self._testapp.authorization = ('Basic', tuple(basic.split(':')))
+        else:
+            self._testapp.authorization = None
+        env = {'wsgi.handleErrors': False}
+        if form:
+            response = self._testapp.post(path, params=form, extra_environ=env)
+        else:
+            response = self._testapp.get(path, extra_environ=env)
+        return response

src/zope/app/container/browser/tests/index.txt

@@ -6,13 +6,13 @@ links).
 
 We can get this view from the root folder easily::
 
-  >>> response = http(r"""
+  >>> response = http(br"""
   ... GET / HTTP/1.1
   ... """)
 
 And we can check that there isn't a form (where the management
 operations would have buttons)::
 
   >>> body = response.getBody().lower()
-  >>> "<form" in body
+  >>> b"<form" in body
   False