This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5227

pycompat: adding Linux detection and fixing Mac
ClosedPublic

Authored by rdamazio on Nov 5 2018, 10:54 PM.

Details

Reviewers
lothiraldan
Group Reviewers
hg-reviewers
Commits
rHG1b49b84d5ed5: pycompat: adding Linux detection and fixing Mac
Summary

Python 3 recommends detecting OSs with the prefix of the platform, but we were
comparing the full string for macOS. We also didn't have Linux detection, which
is convenient for extensions to use (rather than have some OSs detected by hg
and some by the extension).

Reference:
https://docs.python.org/3/library/sys.html#sys.platform

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

rdamazio created this revision.Nov 5 2018, 10:54 PM
lothiraldan accepted this revision.Nov 6 2018, 4:21 AM
lothiraldan added a subscriber: lothiraldan.

LGTM and seems to be what psutil is doing also: https://github.com/giampaolo/psutil/blob/master/psutil/_common.py#L75

Closed by commit rHG1b49b84d5ed5: pycompat: adding Linux detection and fixing Mac (authored by rdamazio). · Explain WhyNov 6 2018, 4:44 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/pycompat.py (3 lines)

Diff 12443

mercurial/pycompat.py

maplist = map maplist = map
rangelist = range rangelist = range
ziplist = zip ziplist = zip
rawinput = raw_input rawinput = raw_input
getargspec = inspect.getargspec getargspec = inspect.getargspec
isjython = sysplatform.startswith(b'java') isjython = sysplatform.startswith(b'java')
isdarwin = sysplatform == b'darwin' isdarwin = sysplatform.startswith(b'darwin')
islinux = sysplatform.startswith(b'linux')
isposix = osname == b'posix' isposix = osname == b'posix'
iswindows = osname == b'nt' iswindows = osname == b'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)