lint: various non-semantic fixes

bumping fail-under for pylint to 9.72
This commit is contained in:
Iain Learmonth 2022-06-23 13:42:45 +01:00
parent 7a54e4ea96
commit f6452cb4fa
14 changed files with 47 additions and 29 deletions

View file

@ -21,8 +21,8 @@ def obfuscator(obj: Any) -> Any:
def json_encode(obj: Any, obfuscate: bool) -> str:
if obfuscate:
obj = obfuscator(obj)
s = json.dumps(obj).replace("!AAA!", "\\u")
return s
result = json.dumps(obj, sort_keys=True).replace("!AAA!", "\\u")
return result
return json.dumps(obj, indent=2, sort_keys=True)
@ -55,9 +55,11 @@ class ListAutomation(TerraformAutomation):
for k in self.template_parameters
}
)
for format_ in lists:
for key, formatter in lists.items():
for obfuscate in [True, False]:
with open(self.working_directory(f"{format_}{'.jsno' if obfuscate else '.json'}"), 'w') as out:
out.write(json_encode(lists[format_](), obfuscate))
with open(self.working_directory(f"{format_}{'.jso' if obfuscate else '.js'}"), 'w') as out:
out.write(javascript_encode(lists[format_](), obfuscate))
with open(self.working_directory(f"{key}{'.jsno' if obfuscate else '.json'}"),
'w', encoding="utf-8") as out:
out.write(json_encode(formatter(), obfuscate))
with open(self.working_directory(f"{key}{'.jso' if obfuscate else '.js'}"),
'w', encoding="utf-8") as out:
out.write(javascript_encode(formatter(), obfuscate))