Drop support for Python 2.

CHANGES.rst

@@ -1,9 +1,10 @@
 Changelog
 =========
 
-3.3 (unreleased)
+4.0 (unreleased)
 ----------------
 
+- Drop support for Python 2.
 
 3.2.2 (2020-02-04)
 ------------------

setup.py

@@ -22,7 +22,7 @@
 with open('CHANGES.rst') as f:
     CHANGES = f.read()
 
-version = '3.3.dev0'
+version = '4.0.dev0'
 
 
 setup(name='DocumentTemplate',
@@ -50,8 +50,6 @@
           "License :: OSI Approved :: Zope Public License",
           "Operating System :: OS Independent",
           "Programming Language :: Python",
-          "Programming Language :: Python :: 2",
-          "Programming Language :: Python :: 2.7",
           "Programming Language :: Python :: 3",
           "Programming Language :: Python :: 3.5",
           "Programming Language :: Python :: 3.6",
@@ -61,13 +59,13 @@
           "Topic :: Text Processing :: Markup",
       ],
       keywords='DTML template zope HTML SQL web markup',
+      python_requires='>=3.4, <4',
       install_requires=[
           'AccessControl >= 4.0a5',
           'Acquisition',
           'ExtensionClass>=4.1a1',
           'RestrictedPython >= 4.0a1',
           'roman',
-          'six',
           'zExceptions',
           'zope.sequencesort',
           'zope.structuredtext',

src/DocumentTemplate/DT_If.py

@@ -81,7 +81,7 @@
 from .DT_Util import parse_params
 
 
-class If(object):
+class If:
     blockContinuations = ('else', 'elif')
     name = 'if'
     elses = None
@@ -131,7 +131,7 @@ def __init__(self, blocks, encoding=None):
         self.simple_form = ('i',) + tuple(sections)
 
 
-class Unless(object):
+class Unless:
     name = 'unless'
     blockContinuations = ()
 

src/DocumentTemplate/DT_In.py

@@ -334,8 +334,6 @@
 import sys
 from operator import itemgetter
 
-import six
-
 from zope.sequencesort.ssort import _Smallest
 
 from ._DocumentTemplate import InstanceDict
@@ -352,17 +350,15 @@
 from .DT_Util import simple_name
 
 
-if sys.version_info > (3, 0):
-    unicode = str
+def cmp(a, b):
+    return (a > b) - (a < b)
 
-    def cmp(a, b):
-        return (a > b) - (a < b)
 
 TupleType = tuple
-StringTypes = six.string_types + (six.binary_type,)
+StringTypes = (str, bytes)
 
 
-class InFactory(object):
+class InFactory:
     blockContinuations = ('else', )
     name = 'in'
 
@@ -377,7 +373,7 @@ def __call__(self, blocks, encoding=None):
 In = InFactory()
 
 
-class InClass(object):
+class InClass:
     elses = None
     expr = sort = batch = mapping = no_push_item = None
     start_name_re = None
@@ -627,7 +623,7 @@ def renderwb(self, md):
                                 if index == first:
                                     pkw['sequence-start'] = 0
                                 continue
-                            raise ValidationError('(item %s): %s' % (
+                            raise ValidationError('(item {}): {}'.format(
                                 index, vv), sys.exc_info()[2])
                     else:
                         client = sequence[index]
@@ -741,7 +737,8 @@ def renderwob(self, md):
                                 pkw['sequence-start'] = 0
                             continue
                         raise ValidationError(
-                            '(item %s): %s' % (index, vv), sys.exc_info()[2])
+                            '(item {}): {}'.format(index, vv),
+                            sys.exc_info()[2])
                 else:
                     client = sequence[index]
 
@@ -955,7 +952,7 @@ def make_sortfunctions(sortfields, md):
     return sf_list
 
 
-class SortBy(object):
+class SortBy:
     def __init__(self, multsort, sf_list):
         self.multsort = multsort
         self.sf_list = sf_list

src/DocumentTemplate/DT_InSV.py

@@ -27,7 +27,7 @@
 TupleType = tuple
 
 
-class sequence_variables(object):
+class sequence_variables:
 
     alt_prefix = None
 
@@ -203,7 +203,7 @@ def statistics(self, name, key):
 
         # Initialize all stats to empty strings:
         for stat in self.statistic_names:
-            data['%s-%s' % (stat, name)] = ''
+            data['{}-{}'.format(stat, name)] = ''
 
         count = len(values)
         try:  # Numeric statistics
@@ -250,8 +250,8 @@ def statistics(self, name, key):
                     except Exception:
                         try:
                             data['median-%s' % name] = (
-                                "between %s and %s" % (values[half],
-                                                       values[half - 1]))
+                                "between {} and {}".format(values[half],
+                                                           values[half - 1]))
                         except Exception:
                             pass
 

src/DocumentTemplate/DT_Let.py

@@ -47,7 +47,7 @@
 from .DT_Util import ParseError
 
 
-class Let(object):
+class Let:
 
     blockContinuations = ()
     name = 'let'

src/DocumentTemplate/DT_Raise.py

@@ -36,7 +36,7 @@ class InvalidErrorTypeExpression(Exception):
     pass
 
 
-class Raise(object):
+class Raise:
 
     blockContinuations = ()
     name = 'raise'

src/DocumentTemplate/DT_Return.py

@@ -15,7 +15,7 @@
 from .DT_Util import parse_params
 
 
-class ReturnTag(object):
+class ReturnTag:
 
     name = 'return'
     expr = None

src/DocumentTemplate/DT_String.py

@@ -15,8 +15,6 @@
 import re
 from threading import Lock
 
-import six
-
 import DocumentTemplate as _dt
 from AccessControl.class_init import InitializeClass
 from AccessControl.SecurityInfo import ClassSecurityInfo
@@ -36,7 +34,7 @@
 COOKLOCK = Lock()
 
 
-class String(object):
+class String:
     """Document templates defined from strings.
 
     Document template strings use an extended form of python string
@@ -78,7 +76,7 @@ def errQuote(self, s):
     @security.private
     def parse_error(self, mess, tag, text, start):
         raise ParseError(
-            "%s, for tag %s, on line %s of %s" % (
+            "{}, for tag {}, on line {} of {}".format(
                 mess, self.errQuote(tag), len(text[:start].split('\n')),
                 self.errQuote(self.__name__)))
 
@@ -121,9 +119,9 @@ def _parseTag(self, match_ob, command=None, sargs='', tt=type(())):
             cname, module, name = command
             d = {}
             try:
-                six.exec_('from %s import %s' % (module, name), d)
+                exec('from {} import {}'.format(module, name), d)
             except ImportError:
-                six.exec_('from DocumentTemplate.%s import %s' % (
+                exec('from DocumentTemplate.{} import {}'.format(
                     module, name), d)
             command = d[name]
             self.commands[cname] = command
@@ -168,7 +166,7 @@ def parseTag(self, match_ob, command=None, sargs=''):
                 raise ParseError('Unexpected tag', tag)
         else:
             # Var command
-            args = args and ("%s %s" % (name, args)) or name
+            args = args and ("{} {}".format(name, args)) or name
             return tag, args, Var, None
 
     @security.private
@@ -555,7 +553,7 @@ def __getstate__(self, _special=('_v_', '_p_')):
 InitializeClass(String)
 
 
-class FileMixin(object):
+class FileMixin:
     # Mix-in class to abstract certain file-related attributes
     edited_source = ''
 

src/DocumentTemplate/DT_Try.py

@@ -13,8 +13,7 @@
 
 import sys
 import traceback
-
-from six import StringIO
+from io import StringIO
 
 from ._DocumentTemplate import InstanceDict
 from ._DocumentTemplate import render_blocks
@@ -24,7 +23,7 @@
 from .DT_Util import parse_params
 
 
-class Try(object):
+class Try:
     """Zope DTML Exception handling
 
     usage:

src/DocumentTemplate/DT_Util.py

@@ -77,7 +77,7 @@ def int_param(params, md, name, default=0, st=type('')):
 functype = type(int_param)
 
 
-class NotBindable(object):
+class NotBindable:
     # Used to prevent TemplateDict from trying to bind to functions.
     def __init__(self, f):
         self._func = f
@@ -100,7 +100,7 @@ def __call__(self, *args, **kw):
         setattr(TemplateDict, name, f)
 
 
-class StringModuleWrapper(object):
+class StringModuleWrapper:
     # Wrap the string module so it can deal with TaintedString strings.
 
     def __getattr__(self, key):
@@ -111,7 +111,7 @@ def __getattr__(self, key):
             return attr
 
 
-class StringFunctionWrapper(object):
+class StringFunctionWrapper:
 
     def __init__(self, method):
         self._method = method
@@ -244,7 +244,7 @@ def __call__(self, **kw):
 simple_name = re.compile('^[a-z][a-z0-9_]*$', re.I).match
 
 
-class Add_with_prefix(object):
+class Add_with_prefix:
 
     def __init__(self, map, defprefix, prefix):
         self.map = map
@@ -258,7 +258,7 @@ def __setitem__(self, name, value):
         if name.startswith(dp + '-'):
             map[self.prefix + name[len(dp):].replace('-', '_')] = value
         else:
-            map['%s_%s' % (self.prefix, name)] = value
+            map['{}_{}'.format(self.prefix, name)] = value
 
 
 def add_with_prefix(map, defprefix, prefix):