--- a/mercurial/ui.py Sun Nov 10 07:30:14 2019 -0800
+++ b/mercurial/ui.py Fri Nov 08 11:19:20 2019 -0800
@@ -428,7 +428,7 @@
self, filename, root=None, trust=False, sections=None, remap=None
):
try:
- fp = open(filename, r'rb')
+ fp = open(filename, 'rb')
except IOError:
if not sections: # ignore unless we were looking for something
return
@@ -1087,7 +1087,7 @@
# inlined _write() for speed
if self._buffers:
- label = opts.get(r'label', b'')
+ label = opts.get('label', b'')
if label and self._bufferapplylabels:
self._buffers[-1].extend(self.label(a, label) for a in args)
else:
@@ -1095,7 +1095,7 @@
return
# inlined _writenobuf() for speed
- if not opts.get(r'keepprogressbar', False):
+ if not opts.get('keepprogressbar', False):
self._progclear()
msg = b''.join(args)
@@ -1108,7 +1108,7 @@
color.win32print(self, dest.write, msg, **opts)
else:
if self._colormode is not None:
- label = opts.get(r'label', b'')
+ label = opts.get('label', b'')
msg = self.label(msg, label)
dest.write(msg)
except IOError as err:
@@ -1124,7 +1124,7 @@
def _write(self, dest, *args, **opts):
# update write() as well if you touch this code
if self._isbuffered(dest):
- label = opts.get(r'label', b'')
+ label = opts.get('label', b'')
if label and self._bufferapplylabels:
self._buffers[-1].extend(self.label(a, label) for a in args)
else:
@@ -1134,7 +1134,7 @@
def _writenobuf(self, dest, *args, **opts):
# update write() as well if you touch this code
- if not opts.get(r'keepprogressbar', False):
+ if not opts.get('keepprogressbar', False):
self._progclear()
msg = b''.join(args)
@@ -1153,7 +1153,7 @@
color.win32print(self, dest.write, msg, **opts)
else:
if self._colormode is not None:
- label = opts.get(r'label', b'')
+ label = opts.get('label', b'')
msg = self.label(msg, label)
dest.write(msg)
# stderr may be buffered under win32 when redirected to files,
@@ -1588,7 +1588,7 @@
return self._prompt(msg, default=default)
def _prompt(self, msg, **opts):
- default = opts[r'default']
+ default = opts['default']
if not self.interactive():
self._writemsg(self._fmsgout, msg, b' ', type=b'prompt', **opts)
self._writemsg(
@@ -1674,7 +1674,7 @@
raise EOFError
return l.rstrip(b'\n')
else:
- return getpass.getpass(r'')
+ return getpass.getpass('')
except EOFError:
raise error.ResponseExpected()
@@ -1765,7 +1765,7 @@
prefix=b'hg-' + extra[b'prefix'] + b'-', suffix=suffix, dir=rdir
)
try:
- f = os.fdopen(fd, r'wb')
+ f = os.fdopen(fd, 'wb')
f.write(util.tonativeeol(text))
f.close()
@@ -1793,7 +1793,7 @@
blockedtag=b'editor',
)
- f = open(name, r'rb')
+ f = open(name, 'rb')
t = util.fromnativeeol(f.read())
f.close()
finally:
@@ -1864,7 +1864,7 @@
)
else:
output = traceback.format_exception(exc[0], exc[1], exc[2])
- self.write_err(encoding.strtolocal(r''.join(output)))
+ self.write_err(encoding.strtolocal(''.join(output)))
return self.tracebackflag or force
def geteditor(self):
@@ -2305,6 +2305,6 @@
isn't a structured channel, so that the message will be colorized.
"""
# TODO: maybe change 'type' to a mandatory option
- if r'type' in opts and not getattr(dest, 'structured', False):
- opts[r'label'] = opts.get(r'label', b'') + b' ui.%s' % opts.pop(r'type')
+ if 'type' in opts and not getattr(dest, 'structured', False):
+ opts['label'] = opts.get('label', b'') + b' ui.%s' % opts.pop('type')
write(dest, *args, **opts)