diff options
| author | Paride Legovini <paride.legovini@canonical.com> | 2020-08-25 17:21:18 +0200 | 
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-25 09:21:18 -0600 | 
| commit | 07104504ab5b30efd2d1f7a8c36effe18b8e5fe0 (patch) | |
| tree | c441dddd012f81dad39cfe97821d83bc7ee1a82b /cloudinit/sources/helpers/openstack.py | |
| parent | 4068137e3ef048d3e2da56a8190f682eb19d501e (diff) | |
| download | vyos-cloud-init-07104504ab5b30efd2d1f7a8c36effe18b8e5fe0.tar.gz vyos-cloud-init-07104504ab5b30efd2d1f7a8c36effe18b8e5fe0.zip | |
tox: bump the pylint version to 2.6.0 in the default run (#544)
Changes:
tox: bump the pylint version to 2.6.0 in the default run
Fix pylint 2.6.0 W0707 warnings (raise-missing-from)
Diffstat (limited to 'cloudinit/sources/helpers/openstack.py')
| -rw-r--r-- | cloudinit/sources/helpers/openstack.py | 34 | 
1 files changed, 20 insertions, 14 deletions
| diff --git a/cloudinit/sources/helpers/openstack.py b/cloudinit/sources/helpers/openstack.py index 1050efb0..65e020c5 100644 --- a/cloudinit/sources/helpers/openstack.py +++ b/cloudinit/sources/helpers/openstack.py @@ -280,8 +280,9 @@ class BaseReader(metaclass=abc.ABCMeta):                  try:                      data = translator(data)                  except Exception as e: -                    raise BrokenMetadata("Failed to process " -                                         "path %s: %s" % (path, e)) +                    raise BrokenMetadata( +                        "Failed to process path %s: %s" % (path, e) +                    ) from e              if found:                  results[name] = data @@ -291,8 +292,9 @@ class BaseReader(metaclass=abc.ABCMeta):              try:                  metadata['random_seed'] = base64.b64decode(random_seed)              except (ValueError, TypeError) as e: -                raise BrokenMetadata("Badly formatted metadata" -                                     " random_seed entry: %s" % e) +                raise BrokenMetadata( +                    "Badly formatted metadata random_seed entry: %s" % e +                ) from e          # load any files that were provided          files = {} @@ -304,8 +306,9 @@ class BaseReader(metaclass=abc.ABCMeta):              try:                  files[path] = self._read_content_path(item)              except Exception as e: -                raise BrokenMetadata("Failed to read provided " -                                     "file %s: %s" % (path, e)) +                raise BrokenMetadata( +                    "Failed to read provided file %s: %s" % (path, e) +                ) from e          results['files'] = files          # The 'network_config' item in metadata is a content pointer @@ -317,8 +320,9 @@ class BaseReader(metaclass=abc.ABCMeta):                  content = self._read_content_path(net_item, decode=True)                  results['network_config'] = content              except IOError as e: -                raise BrokenMetadata("Failed to read network" -                                     " configuration: %s" % (e)) +                raise BrokenMetadata( +                    "Failed to read network configuration: %s" % (e) +                ) from e          # To openstack, user can specify meta ('nova boot --meta=key=value')          # and those will appear under metadata['meta']. @@ -370,8 +374,9 @@ class ConfigDriveReader(BaseReader):              try:                  return util.load_json(self._path_read(path))              except Exception as e: -                raise BrokenMetadata("Failed to process " -                                     "path %s: %s" % (path, e)) +                raise BrokenMetadata( +                    "Failed to process path %s: %s" % (path, e) +                ) from e      def read_v1(self):          """Reads a version 1 formatted location. @@ -395,16 +400,17 @@ class ConfigDriveReader(BaseReader):                  path = found[name]                  try:                      contents = self._path_read(path) -                except IOError: -                    raise BrokenMetadata("Failed to read: %s" % path) +                except IOError as e: +                    raise BrokenMetadata("Failed to read: %s" % path) from e                  try:                      # 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)) +                    raise BrokenMetadata( +                        "Failed to process path %s: %s" % (path, e) +                    ) from e              else:                  md[key] = copy.deepcopy(default) | 
