Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-04-03 04:52:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1563797 - Use 'backports.shutil_which' instead of 'which' in configure r=glandium

Browse Source 
This gets rid of the last use of the 'which' module left in the tree. So not
only will this help 'configure' become a little more Python 3 compatible, but
we can now remove 'third_party/python/which'.

Differential Revision: https://phabricator.services.mozilla.com/D37427

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Andrew Halberstadt 2020-01-10 21:04:10 +00:00
parent cc09e4e703
commit 2fd209f77e
2 changed files with 24 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
build/moz.configure/util.configure
View File

@ -162,12 +162,10 @@ normalize_path = normalize_path()
# exists. # exists.
# The `paths` parameter may be passed to search the given paths instead of # The `paths` parameter may be passed to search the given paths instead of
# $PATH. # $PATH.
@imports(_from='which', _import='which')
@imports(_from='which', _import='WhichError')
@imports('itertools')
@imports('sys') @imports('sys')
@imports(_from='os', _import='pathsep') @imports(_from='os', _import='pathsep')
@imports(_from='os', _import='environ') @imports(_from='os', _import='environ')
@imports(_from='mozfile', _import='which')
def find_program(file, paths=None): def find_program(file, paths=None):
# The following snippet comes from `which` itself, with a slight # The following snippet comes from `which` itself, with a slight
# modification to use lowercase extensions, because it's confusing rustup # modification to use lowercase extensions, because it's confusing rustup
@ -184,21 +182,18 @@ def find_program(file, paths=None):
else: else:
exts = None exts = None
try: if is_absolute_or_relative(file):
if is_absolute_or_relative(file): path = which(os.path.basename(file), path=os.path.dirname(file), exts=exts)
return normalize_path(which(os.path.basename(file), return normalize_path(path) if path else None
[os.path.dirname(file)], exts=exts))
if paths: if paths:
if not isinstance(paths, (list, tuple)): if not isinstance(paths, (list, tuple)):
die("Paths provided to find_program must be a list of strings, " die("Paths provided to find_program must be a list of strings, "
"not %r", paths) "not %r", paths)
paths = list(itertools.chain( paths = pathsep.join(paths)
*(p.split(pathsep) for p in paths if p)))
else: path = which(file, path=paths, exts=exts)
paths = environ['PATH'].split(pathsep) return normalize_path(path) if path else None
return normalize_path(which(file, path=paths, exts=exts))
except WhichError:
return None
@imports('os') @imports('os')

22
python/mozbuild/mozbuild/test/configure/common.py
View File

@ -11,13 +11,12 @@ import subprocess
import sys import sys
import tempfile import tempfile
import unittest import unittest
from StringIO import StringIO
from mozbuild.configure import ConfigureSandbox from mozbuild.configure import ConfigureSandbox
from mozbuild.util import ReadOnlyNamespace from mozbuild.util import ReadOnlyNamespace
from mozpack import path as mozpath from mozpack import path as mozpath
from six import string_types
from StringIO import StringIO
from which import WhichError
from buildconfig import ( from buildconfig import (
topobjdir, topobjdir,
@ -110,13 +109,12 @@ class ConfigureTestSandbox(ConfigureSandbox):
if what in self.modules: if what in self.modules:
return self.modules[what] return self.modules[what]
if what == 'which.which': if what == 'mozfile.which':
return self.which return self.which
if what == 'which': if what == 'mozfile':
return ReadOnlyNamespace( return ReadOnlyNamespace(
which=self.which, which=self.which,
WhichError=WhichError,
) )
if what == 'subprocess.Popen': if what == 'subprocess.Popen':
@ -186,18 +184,20 @@ class ConfigureTestSandbox(ConfigureSandbox):
path_out.value = fake_short_path(path_in) path_out.value = fake_short_path(path_in)
return length return length
def which(self, command, path=None, exts=None): def which(self, command, mode=None, path=None, exts=None):
if isinstance(path, string_types):
path = path.split(os.pathsep)
for parent in (path or self._search_path): for parent in (path or self._search_path):
c = mozpath.abspath(mozpath.join(parent, command)) c = mozpath.abspath(mozpath.join(parent, command))
for candidate in (c, ensure_exe_extension(c)): for candidate in (c, ensure_exe_extension(c)):
if self.imported_os.path.exists(candidate): if self.imported_os.path.exists(candidate):
return candidate return candidate
raise WhichError() return None
def Popen(self, args, stdin=None, stdout=None, stderr=None, **kargs): def Popen(self, args, stdin=None, stdout=None, stderr=None, **kargs):
try: program = self.which(args[0])
program = self.which(args[0]) if not program:
except WhichError:
raise OSError(errno.ENOENT, 'File not found') raise OSError(errno.ENOENT, 'File not found')
func = self._subprocess_paths.get(program) func = self._subprocess_paths.get(program)