mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-18 07:45:30 +00:00
02a7b4ebdf
Allow-list all Python code in tree for use with the black linter, and re-format all code in-tree accordingly. To produce this patch I did all of the following: 1. Make changes to tools/lint/black.yml to remove include: stanza and update list of source extensions. 2. Run ./mach lint --linter black --fix 3. Make some ad-hoc manual updates to python/mozbuild/mozbuild/test/configure/test_configure.py -- it has some hard-coded line numbers that the reformat breaks. 4. Make some ad-hoc manual updates to `testing/marionette/client/setup.py`, `testing/marionette/harness/setup.py`, and `testing/firefox-ui/harness/setup.py`, which have hard-coded regexes that break after the reformat. 5. Add a set of exclusions to black.yml. These will be deleted in a follow-up bug (1672023). # ignore-this-changeset Differential Revision: https://phabricator.services.mozilla.com/D94045
52 lines
1.5 KiB
Python
52 lines
1.5 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, unicode_literals
|
|
|
|
import copy
|
|
|
|
|
|
def merge_to(source, dest):
|
|
"""
|
|
Merge dict and arrays (override scalar values)
|
|
|
|
Keys from source override keys from dest, and elements from lists in source
|
|
are appended to lists in dest.
|
|
|
|
:param dict source: to copy from
|
|
:param dict dest: to copy to (modified in place)
|
|
"""
|
|
|
|
for key, value in source.items():
|
|
# Override mismatching or empty types
|
|
if type(value) != type(dest.get(key)): # noqa
|
|
dest[key] = source[key]
|
|
continue
|
|
|
|
# Merge dict
|
|
if isinstance(value, dict):
|
|
merge_to(value, dest[key])
|
|
continue
|
|
|
|
if isinstance(value, list):
|
|
dest[key] = dest[key] + source[key]
|
|
continue
|
|
|
|
dest[key] = source[key]
|
|
|
|
return dest
|
|
|
|
|
|
def merge(*objects):
|
|
"""
|
|
Merge the given objects, using the semantics described for merge_to, with
|
|
objects later in the list taking precedence. From an inheritance
|
|
perspective, "parents" should be listed before "children".
|
|
|
|
Returns the result without modifying any arguments.
|
|
"""
|
|
if len(objects) == 1:
|
|
return copy.deepcopy(objects[0])
|
|
return merge_to(objects[-1], merge(*objects[:-1]))
|