Patchwork D6049: global: use raw strings for namedtuple()

login
register
mail settings
Submitter phabricator
Date March 2, 2019, 9:26 p.m.
Message ID <differential-rev-PHID-DREV-gb4xhsambrsvz67gu3bz-req@phab.mercurial-scm.org>
Download mbox | patch
Permalink /patch/39002/
State Superseded
Headers show

Comments

phabricator - March 2, 2019, 9:26 p.m.
indygreg created this revision.
Herald added subscribers: mercurial-devel, mjpieters.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  Otherwise Python 2 will attempt to coerce unicode to str, which
  we don't want.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D6049

AFFECTED FILES
  hgext/journal.py
  mercurial/util.py

CHANGE DETAILS




To: indygreg, #hg-reviewers
Cc: mjpieters, mercurial-devel

Patch

diff --git a/mercurial/util.py b/mercurial/util.py
--- a/mercurial/util.py
+++ b/mercurial/util.py
@@ -3211,9 +3211,9 @@ 
 SERVERROLE = 'server'
 CLIENTROLE = 'client'
 
-compewireprotosupport = collections.namedtuple(u'compenginewireprotosupport',
-                                               (u'name', u'serverpriority',
-                                                u'clientpriority'))
+compewireprotosupport = collections.namedtuple(r'compenginewireprotosupport',
+                                               (r'name', r'serverpriority',
+                                                r'clientpriority'))
 
 class compressormanager(object):
     """Holds registrations of various compression engines.
diff --git a/hgext/journal.py b/hgext/journal.py
--- a/hgext/journal.py
+++ b/hgext/journal.py
@@ -194,8 +194,8 @@ 
     return orig(ui, repo, repopath)
 
 class journalentry(collections.namedtuple(
-        u'journalentry',
-        u'timestamp user command namespace name oldhashes newhashes')):
+        r'journalentry',
+        r'timestamp user command namespace name oldhashes newhashes')):
     """Individual journal entry
 
     * timestamp: a mercurial (time, timezone) tuple