diff --git a/doc/hgmanpage.py b/doc/hgmanpage.py --- a/doc/hgmanpage.py +++ b/doc/hgmanpage.py @@ -288,10 +288,10 @@ class Translator(nodes.NodeVisitor): text = node.astext() text = text.replace('\\','\\e') replace_pairs = [ - (u'-', ur'\-'), - (u'\'', ur'\(aq'), - (u'´', ur'\''), - (u'`', ur'\(ga'), + (u'-', u'\\-'), + (u"'", u'\\(aq'), + (u'´', u"\\'"), + (u'`', u'\\(ga'), ] for (in_char, out_markup) in replace_pairs: text = text.replace(in_char, out_markup) diff --git a/tests/test-check-py3-compat.t b/tests/test-check-py3-compat.t --- a/tests/test-check-py3-compat.t +++ b/tests/test-check-py3-compat.t @@ -16,7 +16,6 @@ $ hg files 'set:(**.py) - grep(pygments)' | sed 's|\\|/|g' \ > | xargs $PYTHON3 contrib/check-py3-compat.py \ > | sed 's/[0-9][0-9]*)$/*)/' - doc/hgmanpage.py: invalid syntax: invalid syntax (, line *) hgext/acl.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) hgext/automv.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*) hgext/blackbox.py: error importing: Can't mix strings and bytes in path components (error at i18n.py:*)