This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5061

f: fix a Python 3 bytes/string issue
ClosedPublic

Authored by durin42 on Oct 13 2018, 6:06 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGda1629c7dda1: f: fix a Python 3 bytes/string issue
Summary

I suspect we should test this tool in isolation, but we don't yet. Oh well.

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.

Revision Contents
Changeset List

PathPackages
Mtests/f (6 lines)

Diff 12155

tests/f

facts.append(b'size=%d' % stat.st_size) facts.append(b'size=%d' % stat.st_size)
if opts.mode and not islink: if opts.mode and not islink:
facts.append(b'mode=%o' % (stat.st_mode & 0o777)) facts.append(b'mode=%o' % (stat.st_mode & 0o777))
if opts.links: if opts.links:
facts.append(b'links=%d' % stat.st_nlink) facts.append(b'links=%d' % stat.st_nlink)
if opts.newer: if opts.newer:
# mtime might be in whole seconds so newer file might be same # mtime might be in whole seconds so newer file might be same
if stat.st_mtime >= os.stat(opts.newer).st_mtime: if stat.st_mtime >= os.stat(opts.newer).st_mtime:
facts.append(b'newer than %s' % opts.newer) facts.append(b'newer than %s' % opts.newer.encode(
'utf8', 'replace'))
else: else:
facts.append(b'older than %s' % opts.newer) facts.append(b'older than %s' % opts.newer.encode(
'utf8', 'replace'))
if opts.md5 and content is not None: if opts.md5 and content is not None:
h = hashlib.md5(content) h = hashlib.md5(content)
facts.append(b'md5=%s' % binascii.hexlify(h.digest())[:opts.bytes]) facts.append(b'md5=%s' % binascii.hexlify(h.digest())[:opts.bytes])
if opts.sha1 and content is not None: if opts.sha1 and content is not None:
h = hashlib.sha1(content) h = hashlib.sha1(content)
facts.append(b'sha1=%s' % binascii.hexlify(h.digest())[:opts.bytes]) facts.append(b'sha1=%s' % binascii.hexlify(h.digest())[:opts.bytes])
if opts.sha256 and content is not None: if opts.sha256 and content is not None:
h = hashlib.sha256(content) h = hashlib.sha256(content)