mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-04-04 13:42:48 +00:00
a5c7e81ae6
The excluded directories aren't being properly handled in the py2/py3 compat linters. In order for FileFinder to apply the exclusions properly they need to either be relative to or contained by the base. This means that currently the following will work: ./mach lint -l py2 <topsrcdir> ./mach lint -l py2 testing/mochitest But this is broken: ./mach lint -l py2 testing This change fixes the compat linters so exclude paths will be made relative to the FileFinder base before passing them in. Any exclude not contained by the base is simply discarded as it won't be relevant to that FileFinder instance anyway. MozReview-Commit-ID: LJx97TvKlSa --HG-- extra : rebase_source : b8f0cb20ec5a88a33c26ace699ed9216b070f443
86 lines
2.4 KiB
Python
86 lines
2.4 KiB
Python
# This Source Code Form is subject to the terms of the Mozilla Public
|
|
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
|
|
from __future__ import absolute_import, print_function
|
|
|
|
import json
|
|
import os
|
|
import tempfile
|
|
from distutils.spawn import find_executable
|
|
|
|
import mozpack.path as mozpath
|
|
from mozpack.files import FileFinder
|
|
from mozprocess import ProcessHandlerMixin
|
|
|
|
from mozlint import result
|
|
|
|
here = os.path.abspath(os.path.dirname(__file__))
|
|
|
|
results = []
|
|
|
|
|
|
class PyCompatProcess(ProcessHandlerMixin):
|
|
def __init__(self, config, *args, **kwargs):
|
|
self.config = config
|
|
kwargs['processOutputLine'] = [self.process_line]
|
|
ProcessHandlerMixin.__init__(self, *args, **kwargs)
|
|
|
|
def process_line(self, line):
|
|
try:
|
|
res = json.loads(line)
|
|
except ValueError:
|
|
print('Non JSON output from linter, will not be processed: {}'.format(line))
|
|
return
|
|
|
|
res['level'] = 'error'
|
|
results.append(result.from_config(self.config, **res))
|
|
|
|
|
|
def run_linter(python, paths, config, **lintargs):
|
|
binary = find_executable(python)
|
|
if not binary:
|
|
# TODO bootstrap python3 if not available
|
|
print('error: {} not detected, aborting py-compat check'.format(python))
|
|
if 'MOZ_AUTOMATION' in os.environ:
|
|
return 1
|
|
return []
|
|
|
|
root = lintargs['root']
|
|
pattern = "**/*.py"
|
|
exclude = [mozpath.join(root, e) for e in lintargs.get('exclude', [])]
|
|
files = []
|
|
for path in paths:
|
|
path = mozpath.normsep(path)
|
|
if os.path.isfile(path):
|
|
files.append(path)
|
|
continue
|
|
|
|
ignore = [e[len(path):].lstrip('/') for e in exclude
|
|
if mozpath.commonprefix((path, e)) == path]
|
|
finder = FileFinder(path, ignore=ignore)
|
|
files.extend([os.path.join(path, p) for p, f in finder.find(pattern)])
|
|
|
|
with tempfile.NamedTemporaryFile(mode='w') as fh:
|
|
fh.write('\n'.join(files))
|
|
fh.flush()
|
|
|
|
cmd = [binary, os.path.join(here, 'check_compat.py'), fh.name]
|
|
|
|
proc = PyCompatProcess(config, cmd)
|
|
proc.run()
|
|
try:
|
|
proc.wait()
|
|
except KeyboardInterrupt:
|
|
proc.kill()
|
|
|
|
return results
|
|
|
|
|
|
def lintpy2(*args, **kwargs):
|
|
return run_linter('python2', *args, **kwargs)
|
|
|
|
|
|
def lintpy3(*args, **kwargs):
|
|
return run_linter('python3', *args, **kwargs)
|