Add Python 3.7 and fix deprecation warnings.

Fixes #2
zopefoundation · Oct 21, 2018 · 77b4c3e · 77b4c3e
1 parent 446ccfe
commit 77b4c3e
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 29 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,7 +5,13 @@ python:
   - 3.4
   - 3.5
   - 3.6
-  - pypy-5.4.1
+  - pypy
+  - pypy3
+matrix:
+    include:
+        - python: "3.7"
+          dist: xenial
+          sudo: true
 script:
   - coverage run -m zope.testrunner --test-path=src  --auto-color --auto-progress
 

diff --git a/CHANGES.rst b/CHANGES.rst
@@ -2,10 +2,10 @@
 CHANGES
 =======
 
-4.0.1 (unreleased)
+4.1.0 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- Add support for Python 3.7.
 
 
 4.0.0 (2017-05-02)

diff --git a/setup.py b/setup.py
@@ -58,7 +58,7 @@ def read(*rnames):
 ]
 
 setup(name='zope.app.component',
-      version='4.0.1.dev0',
+      version='4.1.0.dev0',
       author='Zope Corporation and Contributors',
       author_email='zope-dev@zope.org',
       description='Local Zope Component Support',
@@ -74,18 +74,21 @@ def read(*rnames):
           'Intended Audience :: Developers',
           'License :: OSI Approved :: Zope Public License',
           'Programming Language :: Python',
+          'Programming Language :: Python :: 2',
           'Programming Language :: Python :: 2.7',
+          'Programming Language :: Python :: 3',
           'Programming Language :: Python :: 3.4',
           'Programming Language :: Python :: 3.5',
           'Programming Language :: Python :: 3.6',
+          'Programming Language :: Python :: 3.7',
           'Programming Language :: Python :: Implementation :: CPython',
           'Programming Language :: Python :: Implementation :: PyPy',
           'Natural Language :: English',
           'Operating System :: OS Independent',
           'Topic :: Internet :: WWW/HTTP',
           'Framework :: Zope :: 3',
       ],
-      url='http://github.com/zopefoundation/zope.app.component',
+      url='https://github.com/zopefoundation/zope.app.component',
       license='ZPL 2.1',
       packages=find_packages('src'),
       package_dir={'': 'src'},

diff --git a/src/zope/app/component/browser/registration.py b/src/zope/app/component/browser/registration.py
@@ -69,7 +69,7 @@ def registrations(self):
         return registrations
 
     def update(self):
-        registrations = dict([(r.id(), r) for r in self.registrations()])
+        registrations = {r.id(): r for r in self.registrations()}
         for id in self.request.form.get('ids', ()):
             r = registrations.get(id)
             if r is not None:
@@ -79,7 +79,7 @@ def __call__(self):
         self.update()
         return self.render()
 
-@component.adapter(zope.component.interfaces.IUtilityRegistration,
+@component.adapter(zope.interface.interfaces.IUtilityRegistration,
                    zope.publisher.interfaces.browser.IBrowserRequest)
 @interface.implementer(IRegistrationDisplay)
 class UtilityRegistrationDisplay(object):
@@ -187,28 +187,28 @@ class AddUtilityRegistration(form.Form):
 
     form_fields = form.Fields(
         schema.Choice(
-           __name__ = 'provided',
-           title=_("Provided interface"),
-           description=_("The interface provided by the utility"),
-           vocabulary="Utility Component Interfaces",
-           required=True,
-           ),
+            __name__='provided',
+            title=_("Provided interface"),
+            description=_("The interface provided by the utility"),
+            vocabulary="Utility Component Interfaces",
+            required=True,
+        ),
         schema.TextLine(
-           __name__ = 'name',
-           title=_("Register As"),
-           description=_("The name under which the utility will be known."),
-           required=False,
-           default=u'',
-           missing_value=u''
-           ),
+            __name__='name',
+            title=_("Register As"),
+            description=_("The name under which the utility will be known."),
+            required=False,
+            default=u'',
+            missing_value=u''
+        ),
         schema.Text(
-           __name__ = 'comment',
-           title=_("Comment"),
-           required=False,
-           default=u'',
-           missing_value=u''
-           ),
-        )
+            __name__='comment',
+            title=_("Comment"),
+            required=False,
+            default=u'',
+            missing_value=u''
+        ),
+    )
 
     name = provided = None
 

diff --git a/src/zope/app/component/testing.py b/src/zope/app/component/testing.py
@@ -34,7 +34,7 @@
 from zope.traversing.interfaces import ITraversable
 
 def buildSampleFolderTree():
-    """
+    r"""
     Create a tree of folders and return the root::
 
            ____________ rootFolder ______________________________

diff --git a/tox.ini b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    py27, pypy, py34, py35, py36
+    py27, pypy, py34, py35, py36, py37
 
 [testenv]
 commands =