This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1675

py3: introduce pycompat.ziplist as zip is a generator on Python 3
ClosedPublic

Authored by pulkit on Dec 12 2017, 6:26 PM.

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Commits
rHGe66d6e938d2d: py3: introduce pycompat.ziplist as zip is a generator on Python 3
rHGa4f655d1161b: py3: introduce pycompat.ziplist as zip is a generator on Python 3
Summary

Similar to map, the return value of zip was also turned into a generator on
Python 3. We have multiple occurences in our codebase where we retrieve the
values of zip multiple times, so let's introduce pycompat.ziplist similar to
pycompat.maplist.

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.Dec 12 2017, 6:26 PM
yuja accepted this revision.Dec 13 2017, 7:42 AM
This revision is now accepted and ready to land.Dec 13 2017, 7:42 AM
Closed by commit rHGa4f655d1161b: py3: introduce pycompat.ziplist as zip is a generator on Python 3 (authored by pulkit). · Explain WhyDec 13 2017, 8:05 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/pycompat.py (2 lines)

Diff 4423

mercurial/pycompat.py

# returns bytes. # returns bytes.
getcwd = os.getcwdb getcwd = os.getcwdb
sysplatform = sys.platform.encode('ascii') sysplatform = sys.platform.encode('ascii')
sysexecutable = sys.executable sysexecutable = sys.executable
if sysexecutable: if sysexecutable:
sysexecutable = os.fsencode(sysexecutable) sysexecutable = os.fsencode(sysexecutable)
stringio = io.BytesIO stringio = io.BytesIO
maplist = lambda *args: list(map(*args)) maplist = lambda *args: list(map(*args))
ziplist = lambda *args: list(zip(*args))
rawinput = input rawinput = input
# TODO: .buffer might not exist if std streams were replaced; we'll need # TODO: .buffer might not exist if std streams were replaced; we'll need
# a silly wrapper to make a bytes stream backed by a unicode one. # a silly wrapper to make a bytes stream backed by a unicode one.
stdin = sys.stdin.buffer stdin = sys.stdin.buffer
stdout = sys.stdout.buffer stdout = sys.stdout.buffer
stderr = sys.stderr.buffer stderr = sys.stderr.buffer
if getattr(sys, 'argv', None) is not None: if getattr(sys, 'argv', None) is not None:
sysargv = sys.argv sysargv = sys.argv
sysplatform = sys.platform sysplatform = sys.platform
getcwd = os.getcwd getcwd = os.getcwd
sysexecutable = sys.executable sysexecutable = sys.executable
shlexsplit = shlex.split shlexsplit = shlex.split
stringio = cStringIO.StringIO stringio = cStringIO.StringIO
maplist = map maplist = map
ziplist = zip
rawinput = raw_input rawinput = raw_input
isjython = sysplatform.startswith('java') isjython = sysplatform.startswith('java')
isdarwin = sysplatform == 'darwin' isdarwin = sysplatform == 'darwin'
isposix = osname == 'posix' isposix = osname == 'posix'
iswindows = osname == 'nt' iswindows = osname == 'nt'
def getoptb(args, shortlist, namelist): def getoptb(args, shortlist, namelist):
return _getoptbwrapper(getopt.getopt, args, shortlist, namelist) return _getoptbwrapper(getopt.getopt, args, shortlist, namelist)
def gnugetoptb(args, shortlist, namelist): def gnugetoptb(args, shortlist, namelist):
return _getoptbwrapper(getopt.gnu_getopt, args, shortlist, namelist) return _getoptbwrapper(getopt.gnu_getopt, args, shortlist, namelist)