Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

servo-tidy: Allow to use MPL with http and https

Browse source
This commit is contained in:
Jan Andre Ikenmeyer 2018-11-19 14:46:20 +01:00
parent 1ac6f435c8
commit 12c0d1350a
No known key found for this signature in database
GPG key ID: 28F9E42748DD95AE
2 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
python/tidy/servo_tidy/licenseck.py
View file

@ -7,12 +7,18 @@
# option. This file may not be copied, modified, or distributed # option. This file may not be copied, modified, or distributed
# except according to those terms. # except according to those terms.
MPL = """\ OLD_MPL = """\
This Source Code Form is subject to the terms of the Mozilla Public \ 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 \ 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/.\ file, You can obtain one at http://mozilla.org/MPL/2.0/.\
""" """
MPL = """\
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 https://mozilla.org/MPL/2.0/.\
"""
APACHE = """\ APACHE = """\
Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or \ Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or \
http://www.apache.org/licenses/LICENSE-2.0> or the MIT license \ http://www.apache.org/licenses/LICENSE-2.0> or the MIT license \

4
python/tidy/servo_tidy/tidy.py
View file

@ -22,7 +22,7 @@ import colorama
import toml import toml
import voluptuous import voluptuous
import yaml import yaml
from licenseck import MPL, APACHE, COPYRIGHT, licenses_toml, licenses_dep_toml from licenseck import OLD_MPL, MPL, APACHE, COPYRIGHT, licenses_toml, licenses_dep_toml
topdir = os.path.abspath(os.path.dirname(sys.argv[0])) topdir = os.path.abspath(os.path.dirname(sys.argv[0]))
wpt = os.path.join(topdir, "tests", "wpt") wpt = os.path.join(topdir, "tests", "wpt")
@ -235,7 +235,7 @@ def check_license(file_name, lines):
license_block.append(line) license_block.append(line)
header = " ".join(license_block) header = " ".join(license_block)
valid_license = MPL in header or is_apache_licensed(header) valid_license = OLD_MPL in header or MPL in header or is_apache_licensed(header)
acknowledged_bad_license = "xfail-license" in header acknowledged_bad_license = "xfail-license" in header
if not (valid_license or acknowledged_bad_license): if not (valid_license or acknowledged_bad_license):
yield (1, "incorrect license") yield (1, "incorrect license")