Merge ffadbcb into a1b72cc

.travis.yml

@@ -12,6 +12,12 @@ python:
   - pypy
   - pypy3
 
+matrix:
+  include:
+    - python: "3.7"
+      dist: xenial
+      sudo: true
+
 script:
   - coverage run -m zope.testrunner --test-path=src
   - if [[ -z "$MINIMAL" ]]; then sphinx-build                      -b html    -d docs/_build/doctrees docs docs/_build/html; fi

CHANGES.rst

@@ -4,9 +4,12 @@ Changes
 4.4.2 (unreleased)
 ------------------
 
+- Add support for Python 3.7.
+
 - Always install ``zope.hookable`` as a dependency (the ``hook``
   extra is now empty). ``zope.hookable`` respects the PURE_PYTHON
   environment variable, and has an optional C extension.
+
 - Make accessing names that have been moved to ``zope.interface``
   produce a ``DeprecationWarning``.
 

docs/zcml.rst

@@ -139,9 +139,8 @@ Of course, if no factory is provided at all, we will get an error:
    ...       />''')
    Traceback (most recent call last):
       ...
-   ZopeXMLConfigurationError: File "<string>", line 4.2-8.8
-         ValueError: No factory specified
-
+   ComponentConfigurationError: No factory specified
+       File "<string>", line 4.2-8.8
 
 Declaring ``for``, ``provides`` and ``name`` in Python
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -311,8 +310,8 @@ Chained factories are not supported for multi-adapters, though:
    ...       />''')
    Traceback (most recent call last):
       ...
-   ZopeXMLConfigurationError: File "<string>", line 4.2-11.8
-         ValueError: Can't use multiple factories and multiple for
+   ComponentConfigurationError: Can't use multiple factories and multiple for
+       File "<string>", line 4.2-11.8
 
 And neither for null-adapters:
 
@@ -328,8 +327,8 @@ And neither for null-adapters:
    ...       />''')
    Traceback (most recent call last):
       ...
-   ZopeXMLConfigurationError: File "<string>", line 4.2-9.8
-         ValueError: Can't use multiple factories and multiple for
+   ComponentConfigurationError: Can't use multiple factories and multiple for
+       File "<string>", line 4.2-9.8
 
 Protected adapters
 ~~~~~~~~~~~~~~~~~~

setup.py

@@ -89,6 +89,7 @@ def read(*rnames):
         "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",
         "Framework :: Zope3",

tox.ini

@@ -2,7 +2,7 @@
 envlist =
 # Jython support pending 2.7 support, due 2012-07-15 or so.  See:
 # http://fwierzbicki.blogspot.com/2012/03/adconion-to-fund-jython-27.html
-    py27,py27-minimal,pypy,py34,py35,py36,pypy3,docs
+    py27,py27-minimal,pypy,py34,py35,py36,py37,pypy3,docs
 
 [mindeps]
 deps =