hgmanpage: stop using raw-unicode strings
authorAugie Fackler <augie@google.com>
Fri, 07 Oct 2016 07:43:04 -0400
changeset 30057 a8ba9a23c893
parent 30056 3eb4df6d15f8
child 30058 8f54f9b8010d
hgmanpage: stop using raw-unicode strings These don't exist in Python 3, and this ends up looking a little more explicit to Martijn and me anyway.
doc/hgmanpage.py
tests/test-check-py3-compat.t
--- a/doc/hgmanpage.py	Fri Oct 07 08:09:23 2016 -0400
+++ b/doc/hgmanpage.py	Fri Oct 07 07:43:04 2016 -0400
@@ -288,10 +288,10 @@
         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)
--- a/tests/test-check-py3-compat.t	Fri Oct 07 08:09:23 2016 -0400
+++ b/tests/test-check-py3-compat.t	Fri Oct 07 07:43:04 2016 -0400
@@ -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 (<unknown>, line *)
   hgext/acl.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*)
   hgext/automv.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*)
   hgext/blackbox.py: error importing: <TypeError> Can't mix strings and bytes in path components (error at i18n.py:*)