hgweb: fix websub regex flag syntax on Python 3 The `websub` config section for hgweb is broken under Python 3 when using regex flags syntax (ie the optional `i` in the example from `hg help config.websub`: patternname = s/SEARCH_REGEX/REPLACE_EXPRESSION/[i] Flags are pulled out of the specified byte-string using a regular expression, and uppercased. The flags are then iterated over and passed to the `re` module using `re.__dict__[item]`, to get the object attribute of the same name from the `re` module. So on Python 2 if the `il` flags are passed, this transition looks like: `'il'` -> `'IL'` -> `'I'` -> `re.__dict__['I']` -> `re.I` However on Python 3, these are bytes objects. When we iterate over a bytes object in Python 3, instead of getting the individual characters in the string as string objects of length one, we get the integer \ value corresponding to that byte. So the same transition looks like: `b'il'` -> `b'IL'` -> `73` -> `re.__dict__[73]` -> `KeyError` This commit fixes the type mismatch by converting the bytes to a system string before iterating over each element to pass to `re`. The transition will now look like: `b'il'` -> `u'IL'` -> `u'I'` -> `re.__dict__[u'I']` -> `re.I` In addition we expand `test-websub.t` to cover the regex flag case (for both the `websub` section and `interhg`). Differential Revision: https://phab.mercurial-scm.org/D6788

     1

#require serve

     2

     3

  $ hg init test

     4

  $ cd test

     5

     6

  $ cat > .hg/hgrc <<EOF

     7

  > [extensions]

     8

  > # this is only necessary to check that the mapping from

     9

  > # interhg to websub works

    10

  > interhg =

    11

  > 

    12

  > [websub]

    13

  > issues = s|Issue(\d+)|<a href="http://bts.example.org/issue\1">Issue\1</a>|

    14

  > tickets = s|ticket(\d+)|<a href="http://ticket.example.org/issue\1">Ticket\1</a>|i

    15

  > 

    16

  > [interhg]

    17

  > # check that we maintain some interhg backwards compatibility...

    18

  > # yes, 'x' is a weird delimiter...

    19

  > markbugs = sxbugx<i class="\x">bug</i>x

    20

  > problems = sxPROBLEMx<i class="\x">problem</i>xi

    21

  > EOF

    22

    23

  $ touch foo

    24

  $ hg add foo

    25

  $ hg commit -d '1 0' -m 'Issue123: fixed the bug! Ticket456 and problem789 too'

    26

    27

  $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log

    28

  $ cat hg.pid >> $DAEMON_PIDS

    29

    30

log

    31

    32

  $ get-with-headers.py localhost:$HGPORT "rev/tip" | grep bts

    33

  <div class="description"><a href="http://bts.example.org/issue123">Issue123</a>: fixed the <i class="x">bug</i>! <a href="http://ticket.example.org/issue456">Ticket456</a> and <i class="x">problem</i>789 too</div>

    34

errors

    35

    36

  $ cat errors.log

    37

    38

  $ cd ..