Index: third_party/WebKit/Source/build/scripts/json5_generator.py |
diff --git a/third_party/WebKit/Source/build/scripts/json5_generator.py b/third_party/WebKit/Source/build/scripts/json5_generator.py |
index 5b7184b3264ab86bfaa9e87747c753c573526882..6dedef6cec905ca783fbcacb2089e2ba2b936070 100644 |
--- a/third_party/WebKit/Source/build/scripts/json5_generator.py |
+++ b/third_party/WebKit/Source/build/scripts/json5_generator.py |
@@ -99,7 +99,10 @@ class Json5File(object): |
self._process(doc) |
@classmethod |
- def load_from_files(cls, file_paths, default_metadata, default_parameters=None): |
+ def load_from_files(cls, file_paths, default_metadata=None, default_parameters=None): |
+ if isinstance(file_paths, basestring): |
+ file_paths = [file_paths] |
+ |
merged_doc = dict() |
for path in file_paths: |
assert path.endswith(".json5") |
@@ -196,8 +199,6 @@ class Writer(object): |
def __init__(self, json5_files): |
self._outputs = {} # file_name -> generator |
self.gperf_path = None |
- if isinstance(json5_files, basestring): |
- json5_files = [json5_files] |
alancutter (OOO until 2018)
2017/04/13 03:23:52
This code (that existed) smells bad. Are we certai
shend
2017/04/13 03:57:43
Done.
|
if json5_files: |
self.json5_file = Json5File.load_from_files(json5_files, |
self.default_metadata, |