Merge pull request #8 from cjwatson/py38

Add support for Python 3.8

5 files changed, 11 insertions, 9 deletions

diff --git a/.travis.yml b/.travis.yml
index 80e6fd7..33ac6d1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,13 +5,10 @@ python:
     - 3.4
     - 3.5
     - 3.6
+    - 3.7
+    - 3.8
     - pypy
     - pypy3
-matrix:
-    include:
-        - python: "3.7"
-          dist: xenial
-          sudo: true
 install:
     - pip install -U pip setuptools
     - pip install -U coverage coveralls
diff --git a/CHANGES.rst b/CHANGES.rst
index 00bc4a2..b724e57 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -5,7 +5,10 @@
 4.5 (unreleased)
 ================
 
-- Nothing changed yet.
+- Fix tests on Python 3.8
+  (`#7 <https://github.com/zopefoundation/zope.contenttype/issues/7>`_).
+
+- Add support for Python 3.8.
 
 
 4.4 (2018-10-05)
diff --git a/setup.py b/setup.py
index e0c37dd..fbb2945 100644
--- a/setup.py
+++ b/setup.py
@@ -52,6 +52,7 @@ setup(
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy',
         'Operating System :: OS Independent',
diff --git a/src/zope/contenttype/tests/testContentTypes.py b/src/zope/contenttype/tests/testContentTypes.py
index 6afeb53..db229a4 100644
--- a/src/zope/contenttype/tests/testContentTypes.py
+++ b/src/zope/contenttype/tests/testContentTypes.py
@@ -22,6 +22,7 @@ class ContentTypesTestCase(unittest.TestCase):
         import mimetypes
         mimetypes.init()
         self._old_state = mimetypes.__dict__.copy()
+        self._old_types_count = len(self._old_state["types_map"])
 
     def tearDown(self):
         import mimetypes
@@ -31,7 +32,7 @@ class ContentTypesTestCase(unittest.TestCase):
     def _check_types_count(self, delta):
         import mimetypes
         self.assertEqual(len(mimetypes.types_map),
-                         len(self._old_state["types_map"]) + delta)
+                         self._old_types_count + delta)
 
     def _getFilename(self, name):
         import os.path
diff --git a/tox.ini b/tox.ini
index 6b4a88d..e4db05c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 envlist =
-   py27,py34,py35,py36,py37,pypy,pypy3,coverage
+   py27,py34,py35,py36,py37,py38,pypy,pypy3,coverage
 
 [testenv]
 commands =
@@ -11,7 +11,7 @@ deps =
 [testenv:coverage]
 usedevelop = true
 basepython =
-    python3.7
+    python3.8
 commands =
     coverage run -m zope.testrunner --test-path=src
     coverage report --fail-under=100