diff options
| author | Daniel Watkins <daniel.watkins@canonical.com> | 2019-02-26 15:23:58 +0000 |
|---|---|---|
| committer | Server Team CI Bot <josh.powers+server-team-bot@canonical.com> | 2019-02-26 15:23:58 +0000 |
| commit | f278a8a3dbb1e45e8d83491ad24e41812cb77ddb (patch) | |
| tree | c8840c7a6a9199a7c0fa918e2d9459192adc9a9d /cloudinit/sources | |
| parent | f0f09629a924435c223f405bea084401ecb7faa2 (diff) | |
| download | vyos-cloud-init-f278a8a3dbb1e45e8d83491ad24e41812cb77ddb.tar.gz vyos-cloud-init-f278a8a3dbb1e45e8d83491ad24e41812cb77ddb.zip | |
util: don't determine string_types ourselves
six already provides this for us, and we're already paying the cost to
determine it there; no need to do it twice.
Diffstat (limited to 'cloudinit/sources')
| -rw-r--r-- | cloudinit/sources/DataSourceOVF.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cloudinit/sources/DataSourceOVF.py b/cloudinit/sources/DataSourceOVF.py index 3a3fcdf6..70e7a5c0 100644 --- a/cloudinit/sources/DataSourceOVF.py +++ b/cloudinit/sources/DataSourceOVF.py @@ -15,6 +15,8 @@ import os import re import time +import six + from cloudinit import log as logging from cloudinit import sources from cloudinit import util @@ -434,7 +436,7 @@ def maybe_cdrom_device(devname): """ if not devname: return False - elif not isinstance(devname, util.string_types): + elif not isinstance(devname, six.string_types): raise ValueError("Unexpected input for devname: %s" % devname) # resolve '..' and multi '/' elements |