From 411dbbebd328163bcb1c676cc711f3e5ed805375 Mon Sep 17 00:00:00 2001 From: Daniel Watkins Date: Mon, 6 Jul 2020 11:31:33 -0400 Subject: 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 --- cloudinit/sources/helpers/openstack.py | 5 ++++- cloudinit/util.py | 4 ++-- tox.ini | 2 +- 3 files changed, 7 insertions(+), 4 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 diff --git a/tox.ini b/tox.ini index 5257f9e3..3fd96702 100644 --- a/tox.ini +++ b/tox.ini @@ -23,7 +23,7 @@ setenv = basepython = python3 deps = # requirements - pylint==2.3.1 + pylint==2.5.3 # test-requirements because unit tests are now present in cloudinit tree -r{toxinidir}/test-requirements.txt -r{toxinidir}/integration-requirements.txt -- cgit v1.2.3