[PATCH 1 of 5] py3: use r'' instead of sysstr('') to get around code transformer
Yuya Nishihara
yuya at tcha.org
Sat Mar 10 11:28:03 UTC 2018
# HG changeset patch
# User Yuya Nishihara <yuya at tcha.org>
# Date 1520665036 -32400
# Sat Mar 10 15:57:16 2018 +0900
# Node ID fca950cc0de8a69d23bf37521e43cc5310009aad
# Parent ebabfc339ee4fe88ae7ff96bc925d66512066da0
py3: use r'' instead of sysstr('') to get around code transformer
Fewer function calls should be better.
diff --git a/hgext/convert/subversion.py b/hgext/convert/subversion.py
--- a/hgext/convert/subversion.py
+++ b/hgext/convert/subversion.py
@@ -1310,7 +1310,7 @@ class svn_sink(converter_sink, commandli
self.setexec = []
fd, messagefile = tempfile.mkstemp(prefix='hg-convert-')
- fp = os.fdopen(fd, pycompat.sysstr('wb'))
+ fp = os.fdopen(fd, r'wb')
fp.write(util.tonativeeol(commit.desc))
fp.close()
try:
diff --git a/hgext/gpg.py b/hgext/gpg.py
--- a/hgext/gpg.py
+++ b/hgext/gpg.py
@@ -60,11 +60,11 @@ class gpg(object):
try:
# create temporary files
fd, sigfile = tempfile.mkstemp(prefix="hg-gpg-", suffix=".sig")
- fp = os.fdopen(fd, pycompat.sysstr('wb'))
+ fp = os.fdopen(fd, r'wb')
fp.write(sig)
fp.close()
fd, datafile = tempfile.mkstemp(prefix="hg-gpg-", suffix=".txt")
- fp = os.fdopen(fd, pycompat.sysstr('wb'))
+ fp = os.fdopen(fd, r'wb')
fp.write(data)
fp.close()
gpgcmd = ("%s --logger-fd 1 --status-fd 1 --verify "
diff --git a/hgext/transplant.py b/hgext/transplant.py
--- a/hgext/transplant.py
+++ b/hgext/transplant.py
@@ -212,7 +212,7 @@ class transplanter(object):
patchfile = None
else:
fd, patchfile = tempfile.mkstemp(prefix='hg-transplant-')
- fp = os.fdopen(fd, pycompat.sysstr('wb'))
+ fp = os.fdopen(fd, r'wb')
gen = patch.diff(source, parent, node, opts=diffopts)
for chunk in gen:
fp.write(chunk)
@@ -260,7 +260,7 @@ class transplanter(object):
self.ui.status(_('filtering %s\n') % patchfile)
user, date, msg = (changelog[1], changelog[2], changelog[4])
fd, headerfile = tempfile.mkstemp(prefix='hg-transplant-')
- fp = os.fdopen(fd, pycompat.sysstr('wb'))
+ fp = os.fdopen(fd, r'wb')
fp.write("# HG changeset patch\n")
fp.write("# User %s\n" % user)
fp.write("# Date %d %d\n" % date)
diff --git a/mercurial/bundlerepo.py b/mercurial/bundlerepo.py
--- a/mercurial/bundlerepo.py
+++ b/mercurial/bundlerepo.py
@@ -349,7 +349,7 @@ class bundlerepository(localrepo.localre
suffix=suffix)
self.tempfile = temp
- with os.fdopen(fdtemp, pycompat.sysstr('wb')) as fptemp:
+ with os.fdopen(fdtemp, r'wb') as fptemp:
fptemp.write(header)
while True:
chunk = readfn(2**18)
diff --git a/mercurial/changegroup.py b/mercurial/changegroup.py
--- a/mercurial/changegroup.py
+++ b/mercurial/changegroup.py
@@ -75,7 +75,7 @@ def writechunks(ui, chunks, filename, vf
fh = open(filename, "wb", 131072)
else:
fd, filename = tempfile.mkstemp(prefix="hg-bundle-", suffix=".hg")
- fh = os.fdopen(fd, pycompat.sysstr("wb"))
+ fh = os.fdopen(fd, r"wb")
cleanup = filename
for c in chunks:
fh.write(c)
diff --git a/mercurial/chgserver.py b/mercurial/chgserver.py
--- a/mercurial/chgserver.py
+++ b/mercurial/chgserver.py
@@ -296,9 +296,9 @@ class channeledsystem(object):
_iochannels = [
# server.ch, ui.fp, mode
- ('cin', 'fin', pycompat.sysstr('rb')),
- ('cout', 'fout', pycompat.sysstr('wb')),
- ('cerr', 'ferr', pycompat.sysstr('wb')),
+ ('cin', 'fin', r'rb'),
+ ('cout', 'fout', r'wb'),
+ ('cerr', 'ferr', r'wb'),
]
class chgcmdserver(commandserver.server):
diff --git a/mercurial/commandserver.py b/mercurial/commandserver.py
--- a/mercurial/commandserver.py
+++ b/mercurial/commandserver.py
@@ -303,8 +303,8 @@ def _protectio(ui):
ui.flush()
newfiles = []
nullfd = os.open(os.devnull, os.O_RDWR)
- for f, sysf, mode in [(ui.fin, util.stdin, pycompat.sysstr('rb')),
- (ui.fout, util.stdout, pycompat.sysstr('wb'))]:
+ for f, sysf, mode in [(ui.fin, util.stdin, r'rb'),
+ (ui.fout, util.stdout, r'wb')]:
if f is sysf:
newfd = os.dup(f.fileno())
os.dup2(nullfd, f.fileno())
diff --git a/mercurial/debugcommands.py b/mercurial/debugcommands.py
--- a/mercurial/debugcommands.py
+++ b/mercurial/debugcommands.py
@@ -1119,7 +1119,7 @@ def debuginstall(ui, **opts):
def writetemp(contents):
(fd, name) = tempfile.mkstemp(prefix="hg-debuginstall-")
- f = os.fdopen(fd, pycompat.sysstr("wb"))
+ f = os.fdopen(fd, r"wb")
f.write(contents)
f.close()
return name
diff --git a/mercurial/filemerge.py b/mercurial/filemerge.py
--- a/mercurial/filemerge.py
+++ b/mercurial/filemerge.py
@@ -674,7 +674,7 @@ def _maketempfiles(repo, fco, fca):
pre = "%s~%s." % (os.path.basename(fullbase), prefix)
(fd, name) = tempfile.mkstemp(prefix=pre, suffix=ext)
data = repo.wwritedata(ctx.path(), ctx.data())
- f = os.fdopen(fd, pycompat.sysstr("wb"))
+ f = os.fdopen(fd, r"wb")
f.write(data)
f.close()
return name
diff --git a/mercurial/httppeer.py b/mercurial/httppeer.py
--- a/mercurial/httppeer.py
+++ b/mercurial/httppeer.py
@@ -459,7 +459,7 @@ class httppeer(wireproto.wirepeer):
try:
# dump bundle to disk
fd, filename = tempfile.mkstemp(prefix="hg-bundle-", suffix=".hg")
- fh = os.fdopen(fd, pycompat.sysstr("wb"))
+ fh = os.fdopen(fd, r"wb")
d = fp.read(4096)
while d:
fh.write(d)
diff --git a/mercurial/i18n.py b/mercurial/i18n.py
--- a/mercurial/i18n.py
+++ b/mercurial/i18n.py
@@ -50,7 +50,7 @@ if (pycompat.iswindows
def setdatapath(datapath):
datapath = pycompat.fsdecode(datapath)
- localedir = os.path.join(datapath, pycompat.sysstr('locale'))
+ localedir = os.path.join(datapath, r'locale')
t = gettextmod.translation(r'hg', localedir, _languages, fallback=True)
global _ugettext
try:
diff --git a/mercurial/patch.py b/mercurial/patch.py
--- a/mercurial/patch.py
+++ b/mercurial/patch.py
@@ -216,7 +216,7 @@ def extract(ui, fileobj):
data = {}
fd, tmpname = tempfile.mkstemp(prefix='hg-patch-')
- tmpfp = os.fdopen(fd, pycompat.sysstr('wb'))
+ tmpfp = os.fdopen(fd, r'wb')
try:
msg = pycompat.emailparser().parse(fileobj)
@@ -1106,7 +1106,7 @@ the hunk is left unchanged.
ncpatchfp = None
try:
# Write the initial patch
- f = os.fdopen(patchfd, pycompat.sysstr("w"))
+ f = os.fdopen(patchfd, r"w")
chunk.header.write(f)
chunk.write(f)
f.write('\n'.join(['# ' + i for i in phelp.splitlines()]))
diff --git a/mercurial/urllibcompat.py b/mercurial/urllibcompat.py
--- a/mercurial/urllibcompat.py
+++ b/mercurial/urllibcompat.py
@@ -18,7 +18,7 @@ class _pycompatstub(object):
"""Add items that will be populated at the first access"""
items = map(_sysstr, items)
self._aliases.update(
- (item.replace(_sysstr('_'), _sysstr('')).lower(), (origin, item))
+ (item.replace(r'_', r'').lower(), (origin, item))
for item in items)
def _registeralias(self, origin, attr, name):
diff --git a/mercurial/util.py b/mercurial/util.py
--- a/mercurial/util.py
+++ b/mercurial/util.py
@@ -91,7 +91,7 @@ def isatty(fp):
# destined stdout with a pipe destined stdout (e.g. pager), we want line
# buffering
if isatty(stdout):
- stdout = os.fdopen(stdout.fileno(), pycompat.sysstr('wb'), 1)
+ stdout = os.fdopen(stdout.fileno(), r'wb', 1)
if pycompat.iswindows:
from . import windows as platform
@@ -1246,7 +1246,7 @@ def tempfilter(s, cmd):
inname, outname = None, None
try:
infd, inname = tempfile.mkstemp(prefix='hg-filter-in-')
- fp = os.fdopen(infd, pycompat.sysstr('wb'))
+ fp = os.fdopen(infd, r'wb')
fp.write(s)
fp.close()
outfd, outname = tempfile.mkstemp(prefix='hg-filter-out-')
@@ -1408,7 +1408,7 @@ def hgexecutable():
"""
if _hgexecutable is None:
hg = encoding.environ.get('HG')
- mainmod = sys.modules[pycompat.sysstr('__main__')]
+ mainmod = sys.modules[r'__main__']
if hg:
_sethgexecutable(hg)
elif mainfrozen():
diff --git a/mercurial/wireproto.py b/mercurial/wireproto.py
--- a/mercurial/wireproto.py
+++ b/mercurial/wireproto.py
@@ -1027,7 +1027,7 @@ def unbundle(repo, proto, heads):
# write bundle data to temporary file because it can be big
fd, tempname = tempfile.mkstemp(prefix='hg-unbundle-')
- fp = os.fdopen(fd, pycompat.sysstr('wb+'))
+ fp = os.fdopen(fd, r'wb+')
r = 0
try:
proto.forwardpayload(fp)
diff --git a/mercurial/worker.py b/mercurial/worker.py
--- a/mercurial/worker.py
+++ b/mercurial/worker.py
@@ -176,7 +176,7 @@ def _posixworker(ui, func, staticargs, a
os._exit(ret & 255)
pids.add(pid)
os.close(wfd)
- fp = os.fdopen(rfd, pycompat.sysstr('rb'), 0)
+ fp = os.fdopen(rfd, r'rb', 0)
def cleanup():
signal.signal(signal.SIGINT, oldhandler)
waitforworkers()
More information about the Mercurial-devel
mailing list