diff options
author | Paride Legovini <paride.legovini@canonical.com> | 2021-07-20 16:58:21 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-20 09:58:21 -0500 |
commit | ec6afadbf0f0f77d5b58dccd70df77da89c2c91d (patch) | |
tree | 5f1a719faf924b28cdc2d6958a3b6a8eb2c771bf /cloudinit/distros/photon.py | |
parent | a984ee78b745b157b4b023a1786bfbd3b2002b88 (diff) | |
download | vyos-cloud-init-ec6afadbf0f0f77d5b58dccd70df77da89c2c91d.tar.gz vyos-cloud-init-ec6afadbf0f0f77d5b58dccd70df77da89c2c91d.zip |
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().
Diffstat (limited to 'cloudinit/distros/photon.py')
-rw-r--r-- | cloudinit/distros/photon.py | 6 |
1 files changed, 3 insertions, 3 deletions
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) |