This is an archive of the discontinued Mercurial Phabricator instance.

Differential D107

util: remove dead code which used to be for old python2 versions
ClosedPublic

Authored by alex_gaynor on Jul 17 2017, 12:38 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG9a2ee9591acc: util: remove dead code which used to be for old python2 versions

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

alex_gaynor created this revision.Jul 17 2017, 12:38 PM
durin42 accepted this revision.Jul 17 2017, 12:43 PM
This revision is now accepted and ready to land.Jul 17 2017, 12:43 PM
indygreg added a subscriber: indygreg.Jul 17 2017, 1:33 PM

It's worth noting that in theory it should be possible to transition from buffer to memoryview. However, there are various bugs in various Python 2 versions where memoryview isn't accepted. Most notable is that the zlib module doesn't accept memoryview until Python 3 IIRC. So we're stuck with buffer for a while :/

alex_gaynor added a comment.Jul 17 2017, 1:35 PM

@indygreg good flag, @durin42 and I had been discussing the "always use memoryview" as a potential follow up patch.

For now this just deletes some dead code.

Closed by commit rHG9a2ee9591acc: util: remove dead code which used to be for old python2 versions (authored by alex_gaynor). · Explain WhyJul 17 2017, 2:30 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/util.py (14 lines)

Diff 208

mercurial/util.py

if v != self._digester[k]: if v != self._digester[k]:
# i18n: first parameter is a digest name # i18n: first parameter is a digest name
raise Abort(_('%s mismatch: expected %s, got %s') % raise Abort(_('%s mismatch: expected %s, got %s') %
(k, v, self._digester[k])) (k, v, self._digester[k]))
try: try:
buffer = buffer buffer = buffer
except NameError: except NameError:
if not pycompat.ispy3:
def buffer(sliceable, offset=0, length=None):
if length is not None:
return sliceable[offset:offset + length]
return sliceable[offset:]
else:
def buffer(sliceable, offset=0, length=None): def buffer(sliceable, offset=0, length=None):
if length is not None: if length is not None:
return memoryview(sliceable)[offset:offset + length] return memoryview(sliceable)[offset:offset + length]
return memoryview(sliceable)[offset:] return memoryview(sliceable)[offset:]
closefds = pycompat.osname == 'posix' closefds = pycompat.osname == 'posix'
_chunksize = 4096 _chunksize = 4096
class bufferedinputpipe(object): class bufferedinputpipe(object):
"""a manually buffered input pipe """a manually buffered input pipe