Release Trac 1.2.4

[Ryan J Ollos]

This ticket is used to coordinate the finalization and testing of the next stable version of Trac, 1.2.4.

[Ryan J Ollos]

We can use ​textwrap.dedent to improve readability of code like in authz_policy tests​: [25c335b6a/rjollos.git].

[Ryan J Ollos]

Additional changes in [82bc65beb/rjollos.git].

[Ryan J Ollos]

comment:1 and comment:2 changes committed to 1.2-stable in r16785, merged to trunk in r16786.

[Ryan J Ollos]

DONE Check that de catalogs are ​included in the release.

[Ryan J Ollos]

Replying to Ryan J Ollos:

comment:1 and comment:2 changes committed to 1.2-stable in r16785, merged to trunk in r16786.

Looks like textwrap.dedent should not be used inside gettext: r17004.

trac/web/main.py

@@ -21 +21 @@
 import cgi
 import dircache
 import fnmatch
-import textwrap
 from functools import partial
 import gc
 import io
@@ -738 +737 @@
             enabled_plugins = _("''Plugin information not available''\n")
             interface_files = _("''Interface customization information not "
                                  "available''\n")
-        return _(textwrap.dedent("""\
-            ==== How to Reproduce ====
-
-            While doing a %(method)s operation on `%(path_info)s`, \
-            Trac issued an internal error.
-
-            ''(please provide additional details here)''
-
-            Request parameters:
-            {{{
-            %(req_args)s
-            }}}
-
-            User agent: `#USER_AGENT#`
-
-            ==== System Information ====
-            %(sys_info)s
-            ==== Enabled Plugins ====
-            %(enabled_plugins)s
-            ==== Interface Customization ====
-            %(interface_customization)s
-            ==== Python Traceback ====
-            {{{
-            %(traceback)s}}}"""),
+        return _("""\
+==== How to Reproduce ====
+
+While doing a %(method)s operation on `%(path_info)s`, \
+Trac issued an internal error.
+
+''(please provide additional details here)''
+
+Request parameters:
+{{{
+%(req_args)s
+}}}
+
+User agent: `#USER_AGENT#`
+
+==== System Information ====
+%(sys_info)s
+==== Enabled Plugins ====
+%(enabled_plugins)s
+==== Interface Customization ====
+%(interface_customization)s
+==== Python Traceback ====
+{{{
+%(traceback)s}}}""",
             method=req.method, path_info=req.path_info,
             req_args=pformat(req.args), sys_info=sys_info,
             enabled_plugins=enabled_plugins,

[Jun Omae]

The changes looks good to me.

We could use cleandoc_ to extract with the dedentation, however the unnecessary spaces between the following lines are not removed even if textwrap.dedent or cleandoc_ is used.

            While doing a %(method)s operation on `%(path_info)s`, \
            Trac issued an internal error.

Python 2.7.12 (default, Nov 12 2018, 14:36:49)
[GCC 5.4.0 20160609] on linux2
Type "help", "copyright", "credits" or "license" for more information.
>>> import textwrap
>>> text = """\
...             While doing a %(method)s operation on `%(path_info)s`, \
...             Trac issued an internal error.
... """
>>> textwrap.dedent(text)
'While doing a %(method)s operation on `%(path_info)s`,             Trac issued an internal error.\n'
                                                       ^^^^^^^^^^^^^

[Ryan J Ollos]

Thanks, committed to 1.2-stable in r17009, merged to trunk in r17010 (and also extracted the message).

[Ryan J Ollos]

Replying to Jun Omae:

We could use cleandoc_ to extract with the dedentation, however the unnecessary spaces between the following lines are not removed even if textwrap.dedent or cleandoc_ is used.

I considered we could just remove the line continuation marker, but cleandoc_ doesn't take arguments as dgettext does.

[Ryan J Ollos]

I made another mistake. Indentation is not removed from CommitTicketReference processor. Proposed fix:

tracopt/ticket/commit_updater.py

@@ -210 +210 @@
             drev += '/' + repos.reponame
         return textwrap.dedent("""\
             In [changeset:"%s" %s]:
-            {{{
-            #!CommitTicketReference repository="%s" revision="%s"
+            {{{#!CommitTicketReference repository="%s" revision="%s"
             %s
-            }}}""" % (revstring, drev, repos.reponame, rev,
-                      changeset.message.strip()))
+            }}}""") % (revstring, drev, repos.reponame, rev,
+                       changeset.message.strip())
 
     def _update_tickets(self, tickets, changeset, comment, date):
         """Update the tickets with the given comment."""

[Ryan J Ollos]

Committed comment:11 fix with test in r17043, merged in r17044. Changed WikiProcessor style on trunk in r17045.