From ec6afadbf0f0f77d5b58dccd70df77da89c2c91d Mon Sep 17 00:00:00 2001 From: Paride Legovini Date: Tue, 20 Jul 2021 16:58:21 +0200 Subject: Update pylint to v2.9.3 and fix the new issues it spots (#946) In CI run against pylint 2.9.3 and fix occurrences of: - W0237 (arguments-renamed) - W0402 (deprecated-module) The W0402 deprecated-module was about module `imp`: cloudinit/patcher.py:9: [W0402(deprecated-module), ] Uses of a deprecated module 'imp' The imp module is deprecated and replaced by importlib, which according to the documentation has no replacement for acquire_lock() and release_lock(), which are the only reason why `imp` is imported. Nothing about the code using this lock that actually requires it. Let's remove the locking code and the import altogether. Dropping the locking makes patcher.patch() an empty wrapper around _patch_logging(). Rename _patch_logging() to patch_logging() and call it directly instead. Drop patch(). --- cloudinit/distros/photon.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'cloudinit/distros/photon.py') diff --git a/cloudinit/distros/photon.py b/cloudinit/distros/photon.py index 0ced7b5f..3ef5dd40 100644 --- a/cloudinit/distros/photon.py +++ b/cloudinit/distros/photon.py @@ -83,19 +83,19 @@ class Distro(distros.Distro): ret, _out, _err = self.exec_cmd(cmd) return ret - def _write_hostname(self, hostname, out_fn): + def _write_hostname(self, hostname, filename): conf = None try: # Try to update the previous one # Let's see if we can read it first. - conf = HostnameConf(util.load_file(out_fn)) + conf = HostnameConf(util.load_file(filename)) conf.parse() except IOError: pass if not conf: conf = HostnameConf('') conf.set_hostname(hostname) - util.write_file(out_fn, str(conf), mode=0o644) + util.write_file(filename, str(conf), mode=0o644) def _read_system_hostname(self): sys_hostname = self._read_hostname(self.hostname_conf_fn) -- cgit v1.2.3