Message of a TypeError is rendered when CommitTicketReference processor is used in newticket page

[Jun Omae]

I encountered TypeError logged from commit_updater.py on production environment.

The exception is raised when CommitTicketReference processor is used in newticket. Message of the exception is rendered as content of the processor.

{{{#!CommitTicketReference repository="reponame" rev=42
}}}

2019-12-20 13:13:25,894 Trac[formatter] DEBUG: Executing Wiki macro CommitTicketReference by provider <tracopt.ticket.commit_updater.CommitTicketReferenceMacro object at 0x7f4e39880b90>
2019-12-20 13:13:25,928 Trac[formatter] ERROR: Processor CommitTicketReference failed for <Resource 'ticket'>:
Traceback (most recent call last):
  File "/venv/trac/1.0.19/lib/python2.5/site-packages/trac/wiki/formatter.py", line 1196, in _exec_processor
    return processor.process(text)
  File "/venv/trac/1.0.19/lib/python2.5/site-packages/trac/wiki/formatter.py", line 364, in process
    text = self.processor(text)
  File "/venv/trac/1.0.19/lib/python2.5/site-packages/trac/wiki/formatter.py", line 348, in _macro_processor
    text, self.args)
  File "/venv/trac/1.0.19/lib/python2.5/site-packages/tracopt/ticket/commit_updater.py", line 315, in expand_macro
    for tkt_id in ticket_re.findall(message)):
  File "/venv/trac/1.0.19/lib/python2.5/site-packages/tracopt/ticket/commit_updater.py", line 315, in <genexpr>
    for tkt_id in ticket_re.findall(message)):
TypeError: int() argument must be a string or a number, not 'NoneType'
192.168.11.19 - - [20/Dec/2019 13:13:25] "POST /1.0-sqlite/newticket HTTP/1.1" 200 -

Quick fix:

tracopt/ticket/commit_updater.py

@@ -47 +47 @@
 from trac.resource import Resource
 from trac.ticket import Ticket
 from trac.ticket.notification import TicketNotifyEmail
+from trac.util import as_int
 from trac.util.datefmt import datetime_now, utc
 from trac.util.text import exception_to_unicode
 from trac.util.translation import _, cleandoc_
@@ -310 +311 @@
             message = content
             resource = Resource('repository', reponame)
         if formatter.context.resource.realm == 'ticket':
+            resource_id = as_int(formatter.context.resource.id, None)
             ticket_re = CommitTicketUpdater.ticket_re
-            if not any(int(tkt_id) == int(formatter.context.resource.id)
+            if not any(int(tkt_id) == resource_id
                        for tkt_id in ticket_re.findall(message)):
                 return tag.p(_("(The changeset message doesn't reference this "
                                "ticket)"), class_='hint')

[Ryan J Ollos]

Please move back to 1.0.20 if you wish to fix for release 1.0.20 (#13294).

[Ryan J Ollos]

Proposed changes: [a83322d7b7/rjollos.git]

[Jun Omae]

Looks good to me. Thanks.

[Ryan J Ollos]

Thanks, committed in r17508.