Fix deprecation warnings (#17)

* Drop support for Python 3.4.

Its test cannot be run any more because `zope.testrunner` no longer supports
Python 3.4

.coveragerc

@@ -1,5 +1,6 @@
 [run]
 source = zope.tales
+plugins = coverage_python_version
 omit =
     */flycheck_*py
 

.travis.yml

@@ -1,7 +1,6 @@
 language: python
 python:
     - 2.7
-    - 3.4
     - 3.5
     - 3.6
     - pypy
@@ -14,7 +13,7 @@ matrix:
           dist: xenial
 install:
     - pip install -U pip setuptools
-    - pip install -U coverage coveralls
+    - pip install -U coverage coverage-python-version coveralls
     - pip install -U -e .[test]
 script:
     - coverage run -m zope.testrunner --test-path=src

CHANGES.rst

@@ -2,9 +2,11 @@
  Changes
 =========
 
-4.4 (unreleased)
+5.0 (unreleased)
 ================
 
+- Drop support for Python 3.4.
+
 - Fix test failures and deprecation warnings occurring when using Python 3.8a1.
   (`#15 <https://github.com/zopefoundation/zope.tales/pull/15>`_)
 

setup.py

@@ -32,7 +32,7 @@ def read(*rnames):
 ]
 
 setup(name='zope.tales',
-      version='4.4.dev0',
+      version='5.0.dev0',
       author='Zope Foundation and Contributors',
       author_email='zope-dev@zope.org',
       description='Zope Template Application Language Expression Syntax '
@@ -52,7 +52,6 @@ def read(*rnames):
           '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',
@@ -68,6 +67,7 @@ def read(*rnames):
       packages=find_packages('src'),
       package_dir={'': 'src'},
       namespace_packages=['zope'],
+      python_requires='>=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*',
       extras_require={
           'test': TESTS_REQUIRE,
           'tal': [

src/zope/tales/tales.py

@@ -20,7 +20,7 @@
 
 try:
     from html import escape
-except ImportError:
+except ImportError:  # pragma: PY2
     from cgi import escape
 
 from zope.interface import implementer

src/zope/tales/tests/__init__.py

@@ -1,2 +1,11 @@
-#
-# This file is necessary to make this directory a package.
+import six
+import unittest
+
+
+class TestCase(unittest.TestCase):
+    """Base test case for Python version compatibility."""
+
+    if six.PY2:  # pragma: PY2
+        # Avoid DeprecationWarning for assertRaisesRegexp on Python 3 while
+        # coping with Python 2 not having the Regex spelling variant
+        assertRaisesRegex = unittest.TestCase.assertRaisesRegexp

src/zope/tales/tests/test_expressions.py

@@ -14,17 +14,17 @@
 ##############################################################################
 """Default TALES expression implementations tests.
 """
-import sys
+import six
 import unittest
 
 from zope.tales.engine import Engine
 from zope.tales.interfaces import ITALESFunctionNamespace
 from zope.tales.tales import Undefined
 from zope.interface import implementer
+import zope.tales.tests
 
 text_type = str if str is not bytes else unicode
 
-PY3 = sys.version_info[0] == 3
 
 class Data(object):
 
@@ -60,7 +60,7 @@ class OldStyleCallable: # NOT object
 
     pass
 
-class ExpressionTestBase(unittest.TestCase):
+class ExpressionTestBase(zope.tales.tests.TestCase):
 
     def setUp(self):
         # Test expression compilation
@@ -94,7 +94,6 @@ def setUp(self):
 
         self.py3BrokenEightBits = "a b'd\\xc3\\xa9j\\xc3\\xa0 vu'"
 
-
     def _compiled_expr(self, expr):
         return self.engine.compile(expr) if isinstance(expr, str) else expr
 
@@ -110,7 +109,7 @@ def _check_evals_to_instance(self, expr, result_kind):
 
     def _check_raises_compiler_error(self, expr_str, regex=None):
         from zope.tales.tales import CompilerError
-        meth = self.assertRaises if regex is None else self.assertRaisesRegexp
+        meth = self.assertRaises if regex is None else self.assertRaisesRegex
         args = (regex,) if regex is not None else ()
         with meth(CompilerError, *args) as exc:
             self.engine.compile(expr_str)
@@ -119,8 +118,7 @@ def _check_raises_compiler_error(self, expr_str, regex=None):
     def _check_subexpr_raises_compiler_error(self, expr, regexp):
         from zope.tales.expressions import SubPathExpr
         from zope.tales.tales import CompilerError
-        with self.assertRaisesRegexp(CompilerError,
-                                     regexp):
+        with self.assertRaisesRegex(CompilerError, regexp):
             SubPathExpr(expr, None, self.engine)
 
 
@@ -178,8 +176,7 @@ def testBadInitalDynamic(self):
 
     def test_dynamic_invalid_variable_name(self):
         from zope.tales.tales import CompilerError
-        with self.assertRaisesRegexp(CompilerError,
-                                     "Invalid variable name"):
+        with self.assertRaisesRegex(CompilerError, "Invalid variable name"):
             self.engine.compile('path:a/?123')
 
     def testOldStyleClassIsCalled(self):
@@ -223,7 +220,7 @@ def testString8Bits(self):
         # Simple eight bit string interpolation should just work.
         # Except on Py3, where we really mess it up.
         expr = self.engine.compile('string:a ${eightBits}')
-        expected = 'a ' + self.context.vars['eightBits'] if not PY3 else self.py3BrokenEightBits
+        expected = 'a ' + self.context.vars['eightBits'] if not six.PY3 else self.py3BrokenEightBits
         self._check_evals_to(expr, expected)
 
     def testStringUnicode(self):
@@ -242,7 +239,7 @@ def testStringFailureWhenMixed(self):
             result = expr(self.context)
             # If we get here, we're on Python 3, which handles this
             # poorly.
-            self.assertTrue(PY3)
+            self.assertTrue(six.PY3)
             self.assertEqual(result, self.py3BrokenEightBits)
             self.context.vars['eightBits'].decode('ascii') # raise UnicodeDecodeError
 
@@ -476,8 +473,7 @@ def testPathOnFunction(self):
 
     def test_path_through_non_callable_nampspace(self):
         expr = self.engine.compile('adapterTest/not_callable_ns:nope')
-        with self.assertRaisesRegexp(ValueError,
-                                     'None'):
+        with self.assertRaisesRegex(ValueError, 'None'):
             expr(self.context)
 
 class TestSimpleModuleImporter(unittest.TestCase):

src/zope/tales/tests/test_tales.py

@@ -21,6 +21,7 @@
 from zope.tales import tales
 from zope.tales.tests.simpleexpr import SimpleExpr
 from zope.testing import renormalizing
+import zope.tales.tests
 
 
 class TestIterator(unittest.TestCase):
@@ -122,7 +123,6 @@ def test_context_createErrorInfo(self):
         self.assertEqual(ei.type, Exception)
         self.assertEqual(ei.value, e)
 
-
     def testVariables(self):
         # Test variables
         ctxt = self.getContext()
@@ -150,20 +150,20 @@ def testVariables(self):
 
         ctxt.endScope()
 
-class TestExpressionEngine(unittest.TestCase):
+class TestExpressionEngine(zope.tales.tests.TestCase):
 
     def setUp(self):
         self.engine = tales.ExpressionEngine()
 
     def test_register_invalid_name(self):
-        with self.assertRaisesRegexp(tales.RegistrationError,
-                                     "Invalid base name"):
+        with self.assertRaisesRegex(tales.RegistrationError,
+                                    "Invalid base name"):
             self.engine.registerBaseName('123', None)
 
     def test_register_duplicate_name(self):
         self.engine.registerBaseName('abc', 123)
-        with self.assertRaisesRegexp(tales.RegistrationError,
-                                     "Multiple registrations"):
+        with self.assertRaisesRegex(tales.RegistrationError,
+                                    "Multiple registrations"):
             self.engine.registerBaseName('abc', None)
 
         self.assertEqual({'abc': 123}, self.engine.getBaseNames())

tox.ini

@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    py27,py34,py35,py36,py37,py38,pypy,pypy3,coverage,docs
+    py27,py35,py36,py37,py38,pypy,pypy3,coverage,docs
 
 [testenv]
 commands =
@@ -14,10 +14,11 @@ basepython =
     python3.7
 commands =
     coverage run -m zope.testrunner --test-path=src []
-    coverage report --fail-under=100
+    coverage report --show-missing --fail-under=100
 deps =
     {[testenv]deps}
     coverage
+    coverage-python-version
 
 [testenv:docs]
 basepython =