aboutsummaryrefslogtreecommitdiffstats
path: root/python
diff options
context:
space:
mode:
Diffstat (limited to 'python')
-rw-r--r--python/mach_bootstrap.py2
-rw-r--r--python/servo/bootstrap.py2
-rw-r--r--python/servo/packages.py2
-rw-r--r--python/servo/servo-binary-formula.rb.in2
-rw-r--r--python/tidy/servo_tidy/licenseck.py8
-rw-r--r--python/tidy/servo_tidy/tidy.py4
-rw-r--r--python/tidy/servo_tidy_tests/ban-domrefcell.rs2
-rw-r--r--python/tidy/servo_tidy_tests/ban.rs2
-rw-r--r--python/tidy/servo_tidy_tests/lib.rs2
-rw-r--r--python/tidy/servo_tidy_tests/long_line.rs2
-rw-r--r--python/tidy/servo_tidy_tests/multiline_string.rs2
-rw-r--r--python/tidy/servo_tidy_tests/rust_tidy.rs2
-rw-r--r--python/tidy/servo_tidy_tests/shebang_license.py2
-rw-r--r--python/tidy/servo_tidy_tests/spec.webidl2
-rw-r--r--python/tidy/servo_tidy_tests/speclink.rs2
-rw-r--r--python/tidy/servo_tidy_tests/whatwg_link.rs2
-rw-r--r--python/tidy/servo_tidy_tests/wrong_space.rs2
17 files changed, 24 insertions, 18 deletions
diff --git a/python/mach_bootstrap.py b/python/mach_bootstrap.py
index 3435b39f06a..9a2a79c6d6a 100644
--- a/python/mach_bootstrap.py
+++ b/python/mach_bootstrap.py
@@ -1,6 +1,6 @@
# 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/.
+# file, You can obtain one at https://mozilla.org/MPL/2.0/.
from __future__ import print_function, unicode_literals
diff --git a/python/servo/bootstrap.py b/python/servo/bootstrap.py
index 262507b79e5..486147451fa 100644
--- a/python/servo/bootstrap.py
+++ b/python/servo/bootstrap.py
@@ -1,6 +1,6 @@
# 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/.
+# file, You can obtain one at https://mozilla.org/MPL/2.0/.
from __future__ import absolute_import, print_function
diff --git a/python/servo/packages.py b/python/servo/packages.py
index f34a495fcc8..15d75ba7e5c 100644
--- a/python/servo/packages.py
+++ b/python/servo/packages.py
@@ -1,6 +1,6 @@
# 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/.
+# You can obtain one at https://mozilla.org/MPL/2.0/.
WINDOWS_MSVC = {
"cmake": "3.7.2",
diff --git a/python/servo/servo-binary-formula.rb.in b/python/servo/servo-binary-formula.rb.in
index fad773f93ab..28f95180eaa 100644
--- a/python/servo/servo-binary-formula.rb.in
+++ b/python/servo/servo-binary-formula.rb.in
@@ -1,6 +1,6 @@
# 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/.
+# file, You can obtain one at https://mozilla.org/MPL/2.0/.
class ServoBin < Formula
desc "Servo, the Parallel Browser Engine Project (binary version)"
diff --git a/python/tidy/servo_tidy/licenseck.py b/python/tidy/servo_tidy/licenseck.py
index 95a1154cc00..28ea34274e7 100644
--- a/python/tidy/servo_tidy/licenseck.py
+++ b/python/tidy/servo_tidy/licenseck.py
@@ -7,12 +7,18 @@
# option. This file may not be copied, modified, or distributed
# except according to those terms.
-MPL = """\
+OLD_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 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 = """\
Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or \
http://www.apache.org/licenses/LICENSE-2.0> or the MIT license \
diff --git a/python/tidy/servo_tidy/tidy.py b/python/tidy/servo_tidy/tidy.py
index f8def74e57c..446db50feea 100644
--- a/python/tidy/servo_tidy/tidy.py
+++ b/python/tidy/servo_tidy/tidy.py
@@ -22,7 +22,7 @@ import colorama
import toml
import voluptuous
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]))
wpt = os.path.join(topdir, "tests", "wpt")
@@ -235,7 +235,7 @@ def check_license(file_name, lines):
license_block.append(line)
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
if not (valid_license or acknowledged_bad_license):
yield (1, "incorrect license")
diff --git a/python/tidy/servo_tidy_tests/ban-domrefcell.rs b/python/tidy/servo_tidy_tests/ban-domrefcell.rs
index 74b79e813cf..9bfc9ba8938 100644
--- a/python/tidy/servo_tidy_tests/ban-domrefcell.rs
+++ b/python/tidy/servo_tidy_tests/ban-domrefcell.rs
@@ -1,6 +1,6 @@
/* 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/. */
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
#![feature(plugin)]
#![plugin(script_plugins)]
diff --git a/python/tidy/servo_tidy_tests/ban.rs b/python/tidy/servo_tidy_tests/ban.rs
index fc5c600041a..9da46d2ee53 100644
--- a/python/tidy/servo_tidy_tests/ban.rs
+++ b/python/tidy/servo_tidy_tests/ban.rs
@@ -1,6 +1,6 @@
/* 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/. */
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
#![feature(plugin)]
#![plugin(script_plugins)]
diff --git a/python/tidy/servo_tidy_tests/lib.rs b/python/tidy/servo_tidy_tests/lib.rs
index 4ca395d8e6d..5fea057b5c5 100644
--- a/python/tidy/servo_tidy_tests/lib.rs
+++ b/python/tidy/servo_tidy_tests/lib.rs
@@ -1,6 +1,6 @@
/* 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/. */
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
#![feature(def)]
#![feature(abc)]
diff --git a/python/tidy/servo_tidy_tests/long_line.rs b/python/tidy/servo_tidy_tests/long_line.rs
index cdc0b2045bc..4d2a0c5cf4f 100644
--- a/python/tidy/servo_tidy_tests/long_line.rs
+++ b/python/tidy/servo_tidy_tests/long_line.rs
@@ -1,5 +1,5 @@
/* 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/. */
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
println!("really really loooooooooooooooooooooooooooooooooooooooooooong lineeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee");
diff --git a/python/tidy/servo_tidy_tests/multiline_string.rs b/python/tidy/servo_tidy_tests/multiline_string.rs
index 06f7fda7a96..0a4d2fa87ee 100644
--- a/python/tidy/servo_tidy_tests/multiline_string.rs
+++ b/python/tidy/servo_tidy_tests/multiline_string.rs
@@ -1,6 +1,6 @@
/* 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/. */
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
// This puts a "multi-line string
diff --git a/python/tidy/servo_tidy_tests/rust_tidy.rs b/python/tidy/servo_tidy_tests/rust_tidy.rs
index a4d662e2c6e..4b6c35b85cb 100644
--- a/python/tidy/servo_tidy_tests/rust_tidy.rs
+++ b/python/tidy/servo_tidy_tests/rust_tidy.rs
@@ -1,6 +1,6 @@
/* 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/. */
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
use app_units::Au;
use azure::azure_hl::{ AntialiasMode, Color, ColorPattern, CompositionOp };
diff --git a/python/tidy/servo_tidy_tests/shebang_license.py b/python/tidy/servo_tidy_tests/shebang_license.py
index 0499f3a93f9..f913d5ee1e4 100644
--- a/python/tidy/servo_tidy_tests/shebang_license.py
+++ b/python/tidy/servo_tidy_tests/shebang_license.py
@@ -1,4 +1,4 @@
#!/usr/bin/env 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/.
+# file, You can obtain one at https://mozilla.org/MPL/2.0/.
diff --git a/python/tidy/servo_tidy_tests/spec.webidl b/python/tidy/servo_tidy_tests/spec.webidl
index 51993ea0d41..83ce8f935c3 100644
--- a/python/tidy/servo_tidy_tests/spec.webidl
+++ b/python/tidy/servo_tidy_tests/spec.webidl
@@ -1,7 +1,7 @@
/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* 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/. */
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
interface Test {
diff --git a/python/tidy/servo_tidy_tests/speclink.rs b/python/tidy/servo_tidy_tests/speclink.rs
index 81828055c06..499953e7bda 100644
--- a/python/tidy/servo_tidy_tests/speclink.rs
+++ b/python/tidy/servo_tidy_tests/speclink.rs
@@ -1,6 +1,6 @@
/* 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/. */
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
impl SpecLinkMethods for SpecLink {
amacro!("Macros inside impls should trigger spec checks.")
diff --git a/python/tidy/servo_tidy_tests/whatwg_link.rs b/python/tidy/servo_tidy_tests/whatwg_link.rs
index e8edfbace49..d6ed712450a 100644
--- a/python/tidy/servo_tidy_tests/whatwg_link.rs
+++ b/python/tidy/servo_tidy_tests/whatwg_link.rs
@@ -1,6 +1,6 @@
/* 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/. */
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
// https://html.spec.whatwg.org/multipage/scripting.html#dom-context-2d-putimagedata
// https://html.spec.whatwg.org/#typographic-conventions
diff --git a/python/tidy/servo_tidy_tests/wrong_space.rs b/python/tidy/servo_tidy_tests/wrong_space.rs
index 50ee5de75b4..be735e2d463 100644
--- a/python/tidy/servo_tidy_tests/wrong_space.rs
+++ b/python/tidy/servo_tidy_tests/wrong_space.rs
@@ -1,6 +1,6 @@
/* 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/. */
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
pub struct TestStruct(
pub testMember1: usize,
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-01 11:49:09 +0000