jasima/majuna
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

lint: various non-semantic fixes

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

4
app/terraform/__init__.py
View file

@ -47,5 +47,5 @@ class BaseAutomation(metaclass=ABCMeta):
:return: None
"""
tmpl = jinja2.Template(template)
with open(self.working_directory(filename), 'w', encoding="utf-8") as tf:
tf.write(tmpl.render(**kwargs))
with open(self.working_directory(filename), 'w', encoding="utf-8") as tfconf:
tfconf.write(tmpl.render(**kwargs))

2
app/terraform/bridge/__init__.py
View file

@ -56,7 +56,7 @@ class BridgeAutomation(TerraformAutomation):
bridge.destroy()
db.session.commit()
def tf_prehook(self) -> Optional[Any]:
def tf_prehook(self) -> Optional[Any]: # pylint: disable=useless-return
self.create_missing()
self.destroy_expired()
return None

16
app/terraform/list/__init__.py
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))