This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2159

py3: use hex(hasher.digest())
ClosedPublic

Authored by indygreg on Feb 11 2018, 9:35 PM.

Details

Reviewers
pulkit
durin42
Group Reviewers
hg-reviewers
Commits
rHG6426878f7f0f: py3: use hex(hasher.digest())
Summary

.hexdigest() returns a system str. .digest() consistently returns
bytes.

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

indygreg created this revision.Feb 11 2018, 9:35 PM
pulkit accepted this revision.Feb 12 2018, 2:34 AM
durin42 accepted this revision.Feb 12 2018, 9:29 PM
This revision is now accepted and ready to land.Feb 12 2018, 9:29 PM
Closed by commit rHG6426878f7f0f: py3: use hex(hasher.digest()) (authored by indygreg). · Explain WhyFeb 12 2018, 9:47 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/largefiles/lfutil.py (5 lines)

Diff 5582

hgext/largefiles/lfutil.py

from __future__ import absolute_import from __future__ import absolute_import
import copy import copy
import hashlib import hashlib
import os import os
import stat import stat
from mercurial.i18n import _ from mercurial.i18n import _
from mercurial.node import hex
from mercurial import ( from mercurial import (
dirstate, dirstate,
encoding, encoding,
error, error,
httpconnection, httpconnection,
match as matchmod, match as matchmod,
node, node,
def copyandhash(instream, outfile): def copyandhash(instream, outfile):
'''Read bytes from instream (iterable) and write them to outfile, '''Read bytes from instream (iterable) and write them to outfile,
computing the SHA-1 hash of the data along the way. Return the hash.''' computing the SHA-1 hash of the data along the way. Return the hash.'''
hasher = hashlib.sha1('') hasher = hashlib.sha1('')
for data in instream: for data in instream:
hasher.update(data) hasher.update(data)
outfile.write(data) outfile.write(data)
return hasher.hexdigest() return hex(hasher.digest())
def hashfile(file): def hashfile(file):
if not os.path.exists(file): if not os.path.exists(file):
return '' return ''
with open(file, 'rb') as fd: with open(file, 'rb') as fd:
return hexsha1(fd) return hexsha1(fd)
def getexecutable(filename): def getexecutable(filename):
return url return url
def hexsha1(fileobj): def hexsha1(fileobj):
"""hexsha1 returns the hex-encoded sha1 sum of the data in the file-like """hexsha1 returns the hex-encoded sha1 sum of the data in the file-like
object data""" object data"""
h = hashlib.sha1() h = hashlib.sha1()
for chunk in util.filechunkiter(fileobj): for chunk in util.filechunkiter(fileobj):
h.update(chunk) h.update(chunk)
return h.hexdigest() return hex(h.digest())
def httpsendfile(ui, filename): def httpsendfile(ui, filename):
return httpconnection.httpsendfile(ui, filename, 'rb') return httpconnection.httpsendfile(ui, filename, 'rb')
def unixpath(path): def unixpath(path):
'''Return a version of path normalized for use with the lfdirstate.''' '''Return a version of path normalized for use with the lfdirstate.'''
return util.pconvert(os.path.normpath(path)) return util.pconvert(os.path.normpath(path))