diff options
| author | Daniel Watkins <oddbloke@ubuntu.com> | 2020-07-06 11:31:33 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-06 09:31:33 -0600 |
| commit | 411dbbebd328163bcb1c676cc711f3e5ed805375 (patch) | |
| tree | c67207e7470f1aacfd99131a1ca6ed466880e805 /cloudinit | |
| parent | b923a9e324fed6832d6afeb9908db25b3918839e (diff) | |
| download | vyos-cloud-init-411dbbebd328163bcb1c676cc711f3e5ed805375.tar.gz vyos-cloud-init-411dbbebd328163bcb1c676cc711f3e5ed805375.zip | |
cloudinit: fix tip-pylint failures and bump pinned pylint version (#478)
Specifically:
* disable E1102 in cloudinit/sources/helpers/openstack.py for reasons
described in a comment, and
* refactor `abs_join` to require at least one positional argument; this
matches os.path.join's signature, and that mismatch is what was
causing pylint to emit a warning
* bump to pylint 2.4.2
Diffstat (limited to 'cloudinit')
| -rw-r--r-- | cloudinit/sources/helpers/openstack.py | 5 | ||||
| -rw-r--r-- | cloudinit/util.py | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/cloudinit/sources/helpers/openstack.py b/cloudinit/sources/helpers/openstack.py index c538720a..1050efb0 100644 --- a/cloudinit/sources/helpers/openstack.py +++ b/cloudinit/sources/helpers/openstack.py @@ -398,7 +398,10 @@ class ConfigDriveReader(BaseReader): except IOError: raise BrokenMetadata("Failed to read: %s" % path) try: - md[key] = translator(contents) + # Disable not-callable pylint check; pylint isn't able to + # determine that every member of FILES_V1 has a callable in + # the appropriate position + md[key] = translator(contents) # pylint: disable=E1102 except Exception as e: raise BrokenMetadata("Failed to process " "path %s: %s" % (path, e)) diff --git a/cloudinit/util.py b/cloudinit/util.py index 81369652..b6f1117f 100644 --- a/cloudinit/util.py +++ b/cloudinit/util.py @@ -1874,8 +1874,8 @@ def make_header(comment_char="#", base='created'): return header -def abs_join(*paths): - return os.path.abspath(os.path.join(*paths)) +def abs_join(base, *paths): + return os.path.abspath(os.path.join(base, *paths)) # shellify, takes a list of commands |