This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3606

py3: make sure we open files in bytes mode
ClosedPublic

Authored by pulkit on May 19 2018, 10:39 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG1978abdb216c: py3: make sure we open files in bytes mode
Summary

we internally deal with bytes and should read files in bytes mode.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

pulkit created this revision.May 19 2018, 10:39 AM
Closed by commit rHG1978abdb216c: py3: make sure we open files in bytes mode (authored by pulkit). · Explain WhyMay 19 2018, 3:39 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/churn.py (2 lines)
Mmercurial/crecord.py (2 lines)

Diff 8810

hgext/churn.py

def pad(s, l): def pad(s, l):
return s + " " * (l - encoding.colwidth(s)) return s + " " * (l - encoding.colwidth(s))
amap = {} amap = {}
aliases = opts.get(r'aliases') aliases = opts.get(r'aliases')
if not aliases and os.path.exists(repo.wjoin('.hgchurn')): if not aliases and os.path.exists(repo.wjoin('.hgchurn')):
aliases = repo.wjoin('.hgchurn') aliases = repo.wjoin('.hgchurn')
if aliases: if aliases:
for l in open(aliases, "r"): for l in open(aliases, "rb"):
try: try:
alias, actual = l.rsplit('=' in l and '=' or None, 1) alias, actual = l.rsplit('=' in l and '=' or None, 1)
amap[alias.strip()] = actual.strip() amap[alias.strip()] = actual.strip()
except ValueError: except ValueError:
l = l.strip() l = l.strip()
if l: if l:
ui.warn(_("skipping malformed alias: %s\n") % l) ui.warn(_("skipping malformed alias: %s\n") % l)
continue continue

mercurial/crecord.py

def testchunkselector(testfn, ui, headerlist, operation=None): def testchunkselector(testfn, ui, headerlist, operation=None):
""" """
test interface to get selection of chunks, and mark the applied flags test interface to get selection of chunks, and mark the applied flags
of the chosen chunks. of the chosen chunks.
""" """
chunkselector = curseschunkselector(headerlist, ui, operation) chunkselector = curseschunkselector(headerlist, ui, operation)
if testfn and os.path.exists(testfn): if testfn and os.path.exists(testfn):
testf = open(testfn) testf = open(testfn, 'rb')
testcommands = [x.rstrip('\n') for x in testf.readlines()] testcommands = [x.rstrip('\n') for x in testf.readlines()]
testf.close() testf.close()
while True: while True:
if chunkselector.handlekeypressed(testcommands.pop(0), test=True): if chunkselector.handlekeypressed(testcommands.pop(0), test=True):
break break
return chunkselector.opts return chunkselector.opts
_headermessages = { # {operation: text} _headermessages = { # {operation: text}