mirror of
https://github.com/ansible-collections/community.general.git
synced 2026-05-08 14:22:46 +00:00
[PR #11043/3478863e backport][stable-12] Address issues reported by ruff check (#11047)
Address issues reported by ruff check (#11043)
* Resolve E713 and E714 (not in/is tests).
* Address UP018 (unnecessary str call).
* UP045 requires Python 3.10+.
* Address UP007 (X | Y for type annotations).
* Address UP035 (import Callable from collections.abc).
* Address UP006 (t.Dict -> dict).
* Address UP009 (UTF-8 encoding comment).
* Address UP034 (extraneous parantheses).
* Address SIM910 (dict.get() with None default).
* Address F401 (unused import).
* Address UP020 (use builtin open).
* Address B009 and B010 (getattr/setattr with constant name).
* Address SIM300 (Yoda conditions).
* UP029 isn't in use anyway.
* Address FLY002 (static join).
* Address B034 (re.sub positional args).
* Address B020 (loop variable overrides input).
* Address B017 (assert raise Exception).
* Address SIM211 (if expression with false/true).
* Address SIM113 (enumerate for loop).
* Address UP036 (sys.version_info checks).
* Remove unnecessary UP039.
* Address SIM201 (not ==).
* Address SIM212 (if expr with twisted arms).
* Add changelog fragment.
* Reformat.
(cherry picked from commit 3478863ef0)
Co-authored-by: Felix Fontein <felix@fontein.de>
This commit is contained in:
@@ -163,7 +163,7 @@ def run():
|
||||
if job_id is None:
|
||||
module.fail_json(msg="Cannot retrieve job with ID None")
|
||||
plan = nomad_client.job.plan_job(job_id, job, diff=True)
|
||||
if not plan["Diff"].get("Type") == "None":
|
||||
if plan["Diff"].get("Type") != "None":
|
||||
changed = True
|
||||
if not module.check_mode:
|
||||
result = nomad_client.jobs.register_job(job)
|
||||
@@ -186,7 +186,7 @@ def run():
|
||||
try:
|
||||
job_id = job_json.get("ID")
|
||||
plan = nomad_client.job.plan_job(job_id, job, diff=True)
|
||||
if not plan["Diff"].get("Type") == "None":
|
||||
if plan["Diff"].get("Type") != "None":
|
||||
changed = True
|
||||
if not module.check_mode:
|
||||
result = nomad_client.jobs.register_job(job)
|
||||
@@ -215,7 +215,7 @@ def run():
|
||||
result = nomad_client.jobs.register_job(job)
|
||||
else:
|
||||
result = nomad_client.validate.validate_job(job)
|
||||
if not result.status_code == 200:
|
||||
if result.status_code != 200:
|
||||
module.fail_json(msg=to_native(result.text))
|
||||
result = json.loads(result.text)
|
||||
changed = True
|
||||
@@ -224,7 +224,7 @@ def run():
|
||||
|
||||
if module.params.get("state") == "absent":
|
||||
try:
|
||||
if not module.params.get("name") is None:
|
||||
if module.params.get("name") is not None:
|
||||
job_name = module.params.get("name")
|
||||
else:
|
||||
if module.params.get("content_format") == "hcl":
|
||||
|
||||
Reference in New Issue
Block a user