diff -r 4cd4344a53c4 -r 9a2ee9591acc mercurial/util.py --- a/mercurial/util.py Sat Jun 17 20:10:22 2017 +0530 +++ b/mercurial/util.py Mon Jul 17 12:38:07 2017 -0400 @@ -295,16 +295,10 @@ try: buffer = buffer 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): - if length is not None: - return memoryview(sliceable)[offset:offset + length] - return memoryview(sliceable)[offset:] + def buffer(sliceable, offset=0, length=None): + if length is not None: + return memoryview(sliceable)[offset:offset + length] + return memoryview(sliceable)[offset:] closefds = pycompat.osname == 'posix'