Merge ~ahasenack/ubuntu/+source/python-tempita:jammy-tempita-2to3-ftbfs into ubuntu/+source/python-tempita:ubuntu/devel

[Andreas Hasenack]

This fixes two issues:

- ftbfs
python 3.10 removed[1][2] the 2to3 option in setup.py, which would run 2to3 (you guessed it) against the code during build, and install the result.
My "fix" here was to build this module with python 3.9 on impish, where the 2to3 option still worked, and diff the result. That's the patch I'm applying on jammy.

- doctests
For some reason I didn't investigate too deeply, the doctests were not being run[3]. When the nose runner was called, the directory it was given was empty, so nothing was run. I overrode the test target in d/rules and called them directly. Which led me to another fix to get them to pass: the exception raised was namespaced to the module (tempita.<exception>), instead of just the exception name. I don't know if this is a python3 change, or what. Again, the simplest change was to just adjust the docstring, and the tests pass correctly.

A bileto ticket with a PPA is available[4], and the dep8 tests actually ran. Failures are just dependencies in i386 and I didn't investigate those :/
While this is up for review, I might still check that.

1. https://bugs.python.org/issue40360
2. https://github.com/pypa/setuptools/issues/2086
3. https://bugs.launchpad.net/bugs/1966532
4. https://bileto.ubuntu.com/#/ticket/4819

[Athos Ribeiro (athos-ribeiro)]

I will take a look at this one :)

[Athos Ribeiro (athos-ribeiro)]

LGTM; thanks, Andreas!

review: Approve

[Andreas Hasenack (ahasenack)]

Thanks Athos, uploaded:

$ dput ubuntu ../python-tempita_0.5.2-6ubuntu1_source.changes
D: Setting host argument.
Checking signature on .changes
gpg: ../python-tempita_0.5.2-6ubuntu1_source.changes: Valid signature from AC983EB5BF6BCBA9
Checking signature on .dsc
gpg: ../python-tempita_0.5.2-6ubuntu1.dsc: Valid signature from AC983EB5BF6BCBA9
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading python-tempita_0.5.2-6ubuntu1.dsc: done.
  Uploading python-tempita_0.5.2-6ubuntu1.debian.tar.xz: done.
  Uploading python-tempita_0.5.2-6ubuntu1_source.buildinfo: done.
  Uploading python-tempita_0.5.2-6ubuntu1_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/changelog b/debian/changelog
index 723fab7..62a734a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+python-tempita (0.5.2-6ubuntu1) jammy; urgency=medium
+
+  * d/p/2to3.patch: quick python 3 conversion using 2to3, exactly how it
+    was being done automatically during build until python 3.10's
+    setuptools removed the 2to3 option from setup.py (LP: #1966323)
+  * Fix and run the existing doc tests (LP: #1966532):
+    - d/p/fix-doc-tests.patch: fix exception name raised in doctests
+    - d/rules: run doc tests
+
+ -- Andreas Hasenack <[e-mail]>  Fri, 25 Mar 2022 22:12:13 -0300
+
 python-tempita (0.5.2-6) unstable; urgency=medium
 
   [ Ondřej Nový ]
diff --git a/debian/control b/debian/control
index f6c39ec..4a7b14e 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: python-tempita
 Section: python
 Priority: optional
-Maintainer: Debian Python Modules Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Python Modules Team <[e-mail]>
 Uploaders:
  Ondřej Kobližek <[e-mail]>,
 Build-Depends:
diff --git a/debian/patches/2to3.patch b/debian/patches/2to3.patch
new file mode 100644
index 0000000..9d4045c
--- /dev/null
+++ b/debian/patches/2to3.patch
@@ -0,0 +1,236 @@
+Description: quick and dirty conversion to python3
+ Tempita was relying on setuptools' 2to3 option which would run 2to3
+ automatically on the tree at build time, prior to installation. That option is
+ gone in python 3.10.
+ .
+ What I did here was build it with python 3.9 and diff the installed python
+ files against the upstream source, and this is the result.
+ .
+ This is probably not the best conversion to python 3, but it's what was being
+ done up until now anyway, automatically, during build.
+Author: Andreas Hasenack <[e-mail]>
+Forwarded: no, upstream seems to have ceased development
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1966323
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=997633
+Last-Update: 2022-03-25
+
+--- a/tempita/__init__.py
++++ b/tempita/__init__.py
+@@ -32,10 +32,10 @@
+ import re
+ import sys
+ import cgi
+-from urllib import quote as url_quote
++from urllib.parse import quote as url_quote
+ import os
+ import tokenize
+-from cStringIO import StringIO
++from io import StringIO
+ from tempita._looper import looper
+ from tempita.compat3 import PY3, bytes, basestring_, next, is_unicode, coerce_text
+ 
+@@ -101,7 +101,7 @@
+             delimiters = (self.default_namespace['start_braces'],
+                           self.default_namespace['end_braces'])
+         else:
+-            assert len(delimiters) == 2 and all([isinstance(delimeter, basestring)
++            assert len(delimiters) == 2 and all([isinstance(delimeter, str)
+                                                  for delimeter in delimiters])
+             self.default_namespace = self.__class__.default_namespace.copy()
+             self.default_namespace['start_braces'] = delimiters[0]
+@@ -198,7 +198,7 @@
+                 position=None, name=self.name)
+         templ = self.get_template(inherit_template, self)
+         self_ = TemplateObject(self.name)
+-        for name, value in defs.iteritems():
++        for name, value in defs.items():
+             setattr(self_, name, value)
+         self_.body = body
+         ns = ns.copy()
+@@ -294,7 +294,7 @@
+         try:
+             try:
+                 value = eval(code, self.default_namespace, ns)
+-            except SyntaxError, e:
++            except SyntaxError as e:
+                 raise SyntaxError(
+                     'invalid syntax in expression: %s' % code)
+             return value
+@@ -306,12 +306,12 @@
+             else:
+                 arg0 = coerce_text(e)
+             e.args = (self._add_line_info(arg0, pos),)
+-            raise exc_info[0], e, exc_info[2]
++            raise exc_info[0](e).with_traceback(exc_info[2])
+ 
+     def _exec(self, code, ns, pos):
+         __traceback_hide__ = True
+         try:
+-            exec code in self.default_namespace, ns
++            exec(code, self.default_namespace, ns)
+         except:
+             exc_info = sys.exc_info()
+             e = exc_info[1]
+@@ -319,7 +319,7 @@
+                 e.args = (self._add_line_info(e.args[0], pos),)
+             else:
+                 e.args = (self._add_line_info(None, pos),)
+-            raise exc_info[0], e, exc_info[2]
++            raise exc_info[0](e).with_traceback(exc_info[2])
+ 
+     def _repr(self, value, pos):
+         __traceback_hide__ = True
+@@ -328,7 +328,7 @@
+                 return ''
+             if self._unicode:
+                 try:
+-                    value = unicode(value)
++                    value = str(value)
+                 except UnicodeDecodeError:
+                     value = bytes(value)
+             else:
+@@ -341,7 +341,7 @@
+             exc_info = sys.exc_info()
+             e = exc_info[1]
+             e.args = (self._add_line_info(e.args[0], pos),)
+-            raise exc_info[0], e, exc_info[2]
++            raise exc_info[0](e).with_traceback(exc_info[2])
+         else:
+             if self._unicode and isinstance(value, bytes):
+                 if not self.default_encoding:
+@@ -350,7 +350,7 @@
+                         '(no default_encoding provided)' % value)
+                 try:
+                     value = value.decode(self.default_encoding)
+-                except UnicodeDecodeError, e:
++                except UnicodeDecodeError as e:
+                     raise UnicodeDecodeError(
+                         e.encoding,
+                         e.object,
+@@ -387,7 +387,7 @@
+ class bunch(dict):
+ 
+     def __init__(self, **kw):
+-        for name, value in kw.iteritems():
++        for name, value in kw.items():
+             setattr(self, name, value)
+ 
+     def __setattr__(self, name, value):
+@@ -410,7 +410,7 @@
+ 
+     def __repr__(self):
+         items = [
+-            (k, v) for k, v in self.iteritems()]
++            (k, v) for k, v in self.items()]
+         items.sort()
+         return '<%s %s>' % (
+             self.__class__.__name__,
+@@ -463,7 +463,7 @@
+ 
+ 
+ def attr(**kw):
+-    kw = list(kw.iteritems())
++    kw = list(kw.items())
+     kw.sort()
+     parts = []
+     for name, value in kw:
+@@ -545,7 +545,7 @@
+         values = {}
+         sig_args, var_args, var_kw, defaults = self._func_signature
+         extra_kw = {}
+-        for name, value in kw.iteritems():
++        for name, value in kw.items():
+             if not var_kw and name not in sig_args:
+                 raise TypeError(
+                     'Unexpected argument %s' % name)
+@@ -568,7 +568,7 @@
+                 raise TypeError(
+                     'Extra position arguments: %s'
+                     % ', '.join(repr(v) for v in args))
+-        for name, value_expr in defaults.iteritems():
++        for name, value_expr in defaults.items():
+             if name not in values:
+                 values[name] = self._template._eval(
+                     value_expr, self._ns, self._pos)
+@@ -614,7 +614,7 @@
+         return 'Empty'
+ 
+     def __unicode__(self):
+-        return u''
++        return ''
+ 
+     def __iter__(self):
+         return iter(())
+@@ -1158,7 +1158,7 @@
+         vars.update(os.environ)
+     for value in args:
+         if '=' not in value:
+-            print('Bad argument: %r' % value)
++            print(('Bad argument: %r' % value))
+             sys.exit(2)
+         name, value = value.split('=', 1)
+         if name.startswith('py:'):
+--- a/tempita/_looper.py
++++ b/tempita/_looper.py
+@@ -7,9 +7,9 @@
+ looper you can get a better sense of the context.  Use like::
+ 
+     >>> for loop, item in looper(['a', 'b', 'c']):
+-    ...     print loop.number, item
++    ...     print(loop.number, item)
+     ...     if not loop.last:
+-    ...         print '---'
++    ...         print('---')
+     1 a
+     ---
+     2 b
+@@ -161,3 +161,4 @@
+             return getter(item) != getter(other)
+         else:
+             return item[getter] != other[getter]
++
+--- a/tempita/compat3.py
++++ b/tempita/compat3.py
+@@ -6,7 +6,7 @@
+ 
+ if sys.version < "3":
+     b = bytes = str
+-    basestring_ = basestring
++    basestring_ = str
+ else:
+ 
+     def b(s):
+@@ -20,14 +20,14 @@
+ if sys.version < "3":
+ 
+     def next(obj):
+-        return obj.next()
++        return obj.__next__()
+ else:
+     next = next
+ 
+ if sys.version < "3":
+ 
+     def is_unicode(obj):
+-        return isinstance(obj, unicode)
++        return isinstance(obj, str)
+ else:
+ 
+     def is_unicode(obj):
+@@ -41,7 +41,7 @@
+         else:
+             attr = '__str__'
+         if hasattr(v, attr):
+-            return unicode(v)
++            return str(v)
+         else:
+             return bytes(v)
+     return v
+--- a/setup.py
++++ b/setup.py
+@@ -36,5 +36,4 @@
+       test_suite='nose.collector',
+       include_package_data=True,
+       zip_safe=True,
+-      use_2to3=True,
+       )
diff --git a/debian/patches/fix-doc-tests.patch b/debian/patches/fix-doc-tests.patch
new file mode 100644
index 0000000..6354ff2
--- /dev/null
+++ b/debian/patches/fix-doc-tests.patch
@@ -0,0 +1,65 @@
+Description: fix doctests
+Author: Andreas Hasenack <[e-mail]>
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/python-tempita/+bug/1966532
+Forwarded: no, upstream seems to have ceased development
+Last-Update: 2022-03-25
+--- a/tempita/__init__.py
++++ b/tempita/__init__.py
+@@ -644,15 +644,15 @@
+         >>> lex('hey {{')
+         Traceback (most recent call last):
+             ...
+-        TemplateError: No }} to finish last expression at line 1 column 7
++        tempita.TemplateError: No }} to finish last expression at line 1 column 7
+         >>> lex('hey }}')
+         Traceback (most recent call last):
+             ...
+-        TemplateError: }} outside expression at line 1 column 7
++        tempita.TemplateError: }} outside expression at line 1 column 7
+         >>> lex('hey {{ {{')
+         Traceback (most recent call last):
+             ...
+-        TemplateError: {{ inside expression at line 1 column 10
++        tempita.TemplateError: {{ inside expression at line 1 column 10
+ 
+     """
+     if delimiters is None:
+@@ -790,31 +790,31 @@
+         >>> parse('{{continue}}')
+         Traceback (most recent call last):
+             ...
+-        TemplateError: continue outside of for loop at line 1 column 3
++        tempita.TemplateError: continue outside of for loop at line 1 column 3
+         >>> parse('{{if x}}foo')
+         Traceback (most recent call last):
+             ...
+-        TemplateError: No {{endif}} at line 1 column 3
++        tempita.TemplateError: No {{endif}} at line 1 column 3
+         >>> parse('{{else}}')
+         Traceback (most recent call last):
+             ...
+-        TemplateError: else outside of an if block at line 1 column 3
++        tempita.TemplateError: else outside of an if block at line 1 column 3
+         >>> parse('{{if x}}{{for x in y}}{{endif}}{{endfor}}')
+         Traceback (most recent call last):
+             ...
+-        TemplateError: Unexpected endif at line 1 column 25
++        tempita.TemplateError: Unexpected endif at line 1 column 25
+         >>> parse('{{if}}{{endif}}')
+         Traceback (most recent call last):
+             ...
+-        TemplateError: if with no expression at line 1 column 3
++        tempita.TemplateError: if with no expression at line 1 column 3
+         >>> parse('{{for x y}}{{endfor}}')
+         Traceback (most recent call last):
+             ...
+-        TemplateError: Bad for (no "in") in 'x y' at line 1 column 3
++        tempita.TemplateError: Bad for (no "in") in 'x y' at line 1 column 3
+         >>> parse('{{py:x=1\ny=2}}')
+         Traceback (most recent call last):
+             ...
+-        TemplateError: Multi-line py blocks must start with a newline at line 1 column 3
++        tempita.TemplateError: Multi-line py blocks must start with a newline at line 1 column 3
+     """
+     if delimiters is None:
+         delimiters = ( Template.default_namespace['start_braces'],
diff --git a/debian/patches/series b/debian/patches/series
index acdaa7d..f128ea0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
 0001-fix-encoding.patch
+2to3.patch
+fix-doc-tests.patch
diff --git a/debian/rules b/debian/rules
index 7513c22..cdd236b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,3 +4,6 @@ export PYBUILD_NAME = tempita
 
 %:
 	dh $@ --buildsystem=pybuild --with python3
+
+override_dh_auto_test:
+	nosetests3 -v