summaryrefslogtreecommitdiff
path: root/cloudinit/sources/DataSourceNoCloud.py
diff options
context:
space:
mode:
authorParide Legovini <paride.legovini@canonical.com>2021-09-21 22:28:30 +0200
committerGitHub <noreply@github.com>2021-09-21 15:28:30 -0500
commit089a307db1fc572461eea1589f1876132c058311 (patch)
tree9d2c32e4e56bf06a4d62a570691730a0d73b8e41 /cloudinit/sources/DataSourceNoCloud.py
parente27c30748e88409b1646a552f994edf9ed9d017e (diff)
downloadvyos-cloud-init-089a307db1fc572461eea1589f1876132c058311.tar.gz
vyos-cloud-init-089a307db1fc572461eea1589f1876132c058311.zip
tox: bump the pinned flake8 and pylint version (#1029)
tox: bump the pinned flake8 and pylint version * pylint: fix W1406 (redundant-u-string-prefix) The u prefix for strings is no longer necessary in Python >=3.0. * pylint: disable W1514 (unspecified-encoding) From https://www.python.org/dev/peps/pep-0597/ (Python 3.10): The new warning stems form https://www.python.org/dev/peps/pep-0597, which says: Developers using macOS or Linux may forget that the default encoding is not always UTF-8. [...] Even Python experts may assume that the default encoding is UTF-8. This creates bugs that only happen on Windows. The warning could be fixed by always specifying encoding='utf-8', however we should be careful to not break environments which are not utf-8 (or explicitly state that only utf-8 is supported). Let's silence the warning for now. * _quick_read_instance_id: cover the case where load_yaml() returns None Spotted by pylint: - E1135 (unsupported-membership-test) - E1136 (unsubscriptable-object) LP: #1944414
Diffstat (limited to 'cloudinit/sources/DataSourceNoCloud.py')
-rw-r--r--cloudinit/sources/DataSourceNoCloud.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/cloudinit/sources/DataSourceNoCloud.py b/cloudinit/sources/DataSourceNoCloud.py
index a126aad3..2d9e86b4 100644
--- a/cloudinit/sources/DataSourceNoCloud.py
+++ b/cloudinit/sources/DataSourceNoCloud.py
@@ -247,7 +247,7 @@ def _quick_read_instance_id(dirs=None):
try:
data = util.pathprefix2dict(d, required=['meta-data'])
md = util.load_yaml(data['meta-data'])
- if iid_key in md:
+ if md and iid_key in md:
return md[iid_key]
except ValueError:
pass