Add Python 3.7 and fix tests.

Fixes #3

.travis.yml

@@ -5,7 +5,14 @@ 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
 

CHANGES.rst

@@ -2,10 +2,10 @@
  CHANGES
 =========
 
-2.0.1 (unreleased)
+2.1.0 (unreleased)
 ==================
 
-- Nothing changed yet.
+- Add support for Python 3.7.
 
 
 2.0.0 (2017-05-23)

setup.py

@@ -47,6 +47,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',
           'Natural Language :: English',

src/zc/resourcelibrary/README.rst

@@ -67,8 +67,8 @@ isn't Javascript or CSS), an exception will occur.
     ... """)
     Traceback (most recent call last):
     ...
-    ZopeXMLConfigurationError:...
-        ConfigurationError: Resource library doesn't know how to include this file: "included.bad".
+    ConfigurationError: Resource library doesn't know how to include this file: "included.bad".
+        File...
 
 Usage
 =====
@@ -256,7 +256,7 @@ must be satisfied or an error will be generated.
     ... """)
     Traceback (most recent call last):
     ...
-    ConfigurationExecutionError:...Resource library "dependent-but-unsatisfied" has unsatisfied dependency on "not-here"...
+    ConfigurationError:...Resource library "dependent-but-unsatisfied" has unsatisfied dependency on "not-here"...
     ...
 
 When the dependencies are satisfied, the registrations will succeed.
@@ -343,8 +343,8 @@ Errors are reported if you do something wrong.
     ... """)
     Traceback (most recent call last):
     ...
-    ZopeXMLConfigurationError: ...
-        ConfigurationError: Directory u'...does-not-exist' does not exist
+    ConfigurationError: Directory u'...does-not-exist' does not exist
+        File...
 
 Multiple Heads
 ==============

src/zc/resourcelibrary/tests/tests.py

@@ -39,7 +39,7 @@
 
 
 @zope.interface.implementer(zope.publisher.interfaces.browser.IBrowserPublisher)
-class TestFactory:
+class TestFactory(object):
 
     def __init__(self, source, checker, name):
         self.name = name
@@ -139,6 +139,8 @@ def __init__(self):
     (re.compile(r"u'([^']*)'"), r"'\1'"),
     (re.compile(r'zope.configuration.xmlconfig.ZopeXMLConfigurationError'),
      'ZopeXMLConfigurationError'),
+    (re.compile(r'zope.configuration.exceptions.ConfigurationError'),
+     'ConfigurationError'),
     (re.compile(r'zope.configuration.config.ConfigurationExecutionError'),
      'ConfigurationExecutionError'),
 ))

tox.ini

@@ -1,8 +1,18 @@
 [tox]
-envlist = py27,py34,py35,py36,pypy
+envlist = py27,py34,py35,py36,py37,pypy
 
 [testenv]
 commands =
     zope-testrunner --test-path=src []
+extras = test
+
+
+[testenv:coverage]
+usedevelop = true
+basepython =
+    python3.6
+commands =
+    coverage run -m zope.testrunner --test-path=src
+    coverage report --fail-under=100
 deps =
-    .[test]
+    coverage