Add support for Python 3.5, 3.6 and 3.9.

Fix deprecation warning.

CHANGES.rst

@@ -4,7 +4,7 @@ CHANGES
 1.2 (unreleased)
 ----------------
 
-- Nothing changed yet.
+- Add support for Python 3.5, 3.6 and 3.9.
 
 
 1.1 (2019-12-03)

setup.py

@@ -41,11 +41,13 @@
         'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
         'Development Status :: 5 - Production/Stable',
-        'Framework :: Zope2',
-        'Framework :: Zope3',
+        'Framework :: Zope :: 3',
         'Intended Audience :: Developers',
         'Natural Language :: English',
         'Operating System :: OS Independent',
@@ -66,7 +68,7 @@
         'zope.traversing',
     ],
     extras_require=dict(test=[
-        'unittest2',
+        'six',
         'zope.app.appsetup',
         'zope.app.publication',
         'zope.app.testing',

src/gocept/__init__.py

@@ -1 +1 @@
-__import__('pkg_resources').declare_namespace(__name__)
+__import__('pkg_resources').declare_namespace(__name__)  # pragma: no cover

src/gocept/xmlrpcskin/testing.py

@@ -13,7 +13,7 @@
 ##############################################################################
 
 import pkg_resources
-import unittest2
+import unittest
 import zope.app.testing.functional
 
 
@@ -23,6 +23,6 @@
 
 
 class TestCase(zope.app.testing.functional.FunctionalTestCase,
-               unittest2.TestCase):
+               unittest.TestCase):
 
     layer = layer

src/gocept/xmlrpcskin/tests/test_endtoend.py

@@ -14,6 +14,7 @@
 
 import gocept.xmlrpcskin.testing
 import gocept.xmlrpcskin.tests.fixture
+import six
 import zope.app.testing.xmlrpc
 import zope.configuration.xmlconfig
 import zope.testbrowser.testing
@@ -33,5 +34,5 @@ def test_view_is_registered_only_for_layer(self):
         self.assertEqual(dict(returncode=1), all.all_layers())
         self.assertEqual(dict(returncode=1), foo.all_layers())
         self.assertEqual(dict(returncode=2), foo.foo_layer())
-        self.assertRaisesRegex(
-            Exception, 'NotFound.*foo_layer', all.foo_layer)
+        six.assertRaisesRegex(
+            self, Exception, 'NotFound.*foo_layer', all.foo_layer)