From bbe74d2b176eb1e81a4091afe9e4a2adb7532cfa Mon Sep 17 00:00:00 2001
From: Felix Fontein <felix@fontein.de>
Date: Sat, 4 Feb 2023 17:28:18 +0100
Subject: [PATCH] [stable-4] Fix pylint errors (#5939)

Fix pylint errors (#5933)

* Fix pylint errors.

* Also adjust to https://github.com/ansible/ansible/pull/79909.

(cherry picked from commit b1d9507cd2986cc2f3e9d918a56477ef2eba3d1f)
---
 changelogs/fragments/5933-linting.yml                  | 2 ++
 plugins/modules/cloud/misc/terraform.py                | 2 +-
 plugins/modules/net_tools/pritunl/pritunl_org.py       | 2 +-
 plugins/modules/net_tools/pritunl/pritunl_org_info.py  | 2 +-
 plugins/modules/net_tools/pritunl/pritunl_user.py      | 2 +-
 plugins/modules/net_tools/pritunl/pritunl_user_info.py | 2 +-
 plugins/modules/system/timezone.py                     | 1 +
 plugins/modules/system/xfconf.py                       | 4 ++--
 8 files changed, 10 insertions(+), 7 deletions(-)
 create mode 100644 changelogs/fragments/5933-linting.yml

diff --git a/changelogs/fragments/5933-linting.yml b/changelogs/fragments/5933-linting.yml
new file mode 100644
index 0000000000..d0c46542bf
--- /dev/null
+++ b/changelogs/fragments/5933-linting.yml
@@ -0,0 +1,2 @@
+bugfixes:
+  - "terraform and timezone - slight refactoring to avoid linter reporting potentially undefined variables (https://github.com/ansible-collections/community.general/pull/5933)."
diff --git a/plugins/modules/cloud/misc/terraform.py b/plugins/modules/cloud/misc/terraform.py
index 61bdfab6f1..56684ea1b4 100644
--- a/plugins/modules/cloud/misc/terraform.py
+++ b/plugins/modules/cloud/misc/terraform.py
@@ -508,9 +508,9 @@ def main():
 
     outputs_command = [command[0], 'output', '-no-color', '-json'] + _state_args(state_file)
     rc, outputs_text, outputs_err = module.run_command(outputs_command, cwd=project_path)
+    outputs = {}
     if rc == 1:
         module.warn("Could not get Terraform outputs. This usually means none have been defined.\nstdout: {0}\nstderr: {1}".format(outputs_text, outputs_err))
-        outputs = {}
     elif rc != 0:
         module.fail_json(
             msg="Failure when getting Terraform outputs. "
diff --git a/plugins/modules/net_tools/pritunl/pritunl_org.py b/plugins/modules/net_tools/pritunl/pritunl_org.py
index 35796ae361..4fb2de9b94 100644
--- a/plugins/modules/net_tools/pritunl/pritunl_org.py
+++ b/plugins/modules/net_tools/pritunl/pritunl_org.py
@@ -180,7 +180,7 @@ def main():
                 required=False, choices=["present", "absent"], default="present"
             ),
         )
-    ),
+    )
 
     module = AnsibleModule(argument_spec=argument_spec)
 
diff --git a/plugins/modules/net_tools/pritunl/pritunl_org_info.py b/plugins/modules/net_tools/pritunl/pritunl_org_info.py
index a7e65c80d1..0b8181743a 100644
--- a/plugins/modules/net_tools/pritunl/pritunl_org_info.py
+++ b/plugins/modules/net_tools/pritunl/pritunl_org_info.py
@@ -115,7 +115,7 @@ def main():
         dict(
             organization=dict(required=False, type="str", default=None, aliases=["org"])
         )
-    ),
+    )
 
     module = AnsibleModule(argument_spec=argument_spec, supports_check_mode=True)
 
diff --git a/plugins/modules/net_tools/pritunl/pritunl_user.py b/plugins/modules/net_tools/pritunl/pritunl_user.py
index 7ea4f18a44..6210dab3cf 100644
--- a/plugins/modules/net_tools/pritunl/pritunl_user.py
+++ b/plugins/modules/net_tools/pritunl/pritunl_user.py
@@ -324,7 +324,7 @@ def main():
             user_disabled=dict(required=False, type="bool", default=None),
             user_gravatar=dict(required=False, type="bool", default=None),
         )
-    ),
+    )
 
     module = AnsibleModule(argument_spec=argument_spec)
 
diff --git a/plugins/modules/net_tools/pritunl/pritunl_user_info.py b/plugins/modules/net_tools/pritunl/pritunl_user_info.py
index e8cf5e2955..8a042c2ecb 100644
--- a/plugins/modules/net_tools/pritunl/pritunl_user_info.py
+++ b/plugins/modules/net_tools/pritunl/pritunl_user_info.py
@@ -157,7 +157,7 @@ def main():
                 default="client",
             ),
         )
-    ),
+    )
 
     module = AnsibleModule(argument_spec=argument_spec, supports_check_mode=True)
 
diff --git a/plugins/modules/system/timezone.py b/plugins/modules/system/timezone.py
index f632939041..abaf20b01d 100644
--- a/plugins/modules/system/timezone.py
+++ b/plugins/modules/system/timezone.py
@@ -355,6 +355,7 @@ class NosystemdTimezone(Timezone):
     def __init__(self, module):
         super(NosystemdTimezone, self).__init__(module)
         # Validate given timezone
+        planned_tz = ''
         if 'name' in self.value:
             tzfile = self._verify_timezone()
             planned_tz = self.value['name']['planned']
diff --git a/plugins/modules/system/xfconf.py b/plugins/modules/system/xfconf.py
index c25041d5f1..88f143fde1 100644
--- a/plugins/modules/system/xfconf.py
+++ b/plugins/modules/system/xfconf.py
@@ -172,8 +172,8 @@ class XFConfException(Exception):
 
 
 class XFConfProperty(CmdStateModuleHelper):
-    change_params = 'value',
-    diff_params = 'value',
+    change_params = ('value', )
+    diff_params = ('value', )
     output_params = ('property', 'channel', 'value')
     facts_params = ('property', 'channel', 'value')
     module = dict(