D5821: convert: use raw string for regular expressions
indygreg (Gregory Szorc)
phabricator at mercurial-scm.org
Mon Feb 4 17:19:35 UTC 2019
indygreg created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
This avoids a SyntaxWarning on Python 3.8.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D5821
AFFECTED FILES
hgext/convert/monotone.py
hgext/convert/p4.py
CHANGE DETAILS
diff --git a/hgext/convert/p4.py b/hgext/convert/p4.py
--- a/hgext/convert/p4.py
+++ b/hgext/convert/p4.py
@@ -64,12 +64,12 @@
self.encoding = self.ui.config('convert', 'p4.encoding',
convcmd.orig_encoding)
self.re_type = re.compile(
- "([a-z]+)?(text|binary|symlink|apple|resource|unicode|utf\d+)"
- "(\+\w+)?$")
+ br"([a-z]+)?(text|binary|symlink|apple|resource|unicode|utf\d+)"
+ br"(\+\w+)?$")
self.re_keywords = re.compile(
- r"\$(Id|Header|Date|DateTime|Change|File|Revision|Author)"
- r":[^$\n]*\$")
- self.re_keywords_old = re.compile("\$(Id|Header):[^$\n]*\$")
+ br"\$(Id|Header|Date|DateTime|Change|File|Revision|Author)"
+ br":[^$\n]*\$")
+ self.re_keywords_old = re.compile(br"\$(Id|Header):[^$\n]*\$")
if revs and len(revs) > 1:
raise error.Abort(_("p4 source does not support specifying "
diff --git a/hgext/convert/monotone.py b/hgext/convert/monotone.py
--- a/hgext/convert/monotone.py
+++ b/hgext/convert/monotone.py
@@ -214,7 +214,7 @@
# key "test at selenic.com"
# mtn >= 0.45:
# key [ff58a7ffb771907c4ff68995eada1c4da068d328]
- certlist = re.split('\n\n key ["\[]', certlist)
+ certlist = re.split(br'\n\n key ["\[]', certlist)
for e in certlist:
m = self.cert_re.match(e)
if m:
To: indygreg, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list