summaryrefslogtreecommitdiff
path: root/cloudinit/util.py
diff options
context:
space:
mode:
authorBarry Warsaw <barry@python.org>2015-01-26 20:02:31 -0500
committerBarry Warsaw <barry@python.org>2015-01-26 20:02:31 -0500
commit5e2b8ef0703eb4582a5a8ba50ae7c83a8294d65a (patch)
tree9f3c2d6d7cdd3e63e52d54152d3dbb15e916d9f3 /cloudinit/util.py
parentfe99f7d6d87e88320933957b2933288c6eb2986d (diff)
downloadvyos-cloud-init-5e2b8ef0703eb4582a5a8ba50ae7c83a8294d65a.tar.gz
vyos-cloud-init-5e2b8ef0703eb4582a5a8ba50ae7c83a8294d65a.zip
Repair the Python 2.6 tests.
Diffstat (limited to 'cloudinit/util.py')
-rw-r--r--cloudinit/util.py18
1 files changed, 9 insertions, 9 deletions
diff --git a/cloudinit/util.py b/cloudinit/util.py
index 32c19ba2..766f8e32 100644
--- a/cloudinit/util.py
+++ b/cloudinit/util.py
@@ -2059,23 +2059,23 @@ def _read_dmi_syspath(key):
Reads dmi data with from /sys/class/dmi/id
"""
- dmi_key = "{}/{}".format(DMI_SYS_PATH, key)
- LOG.debug("querying dmi data {}".format(dmi_key))
+ dmi_key = "{0}/{1}".format(DMI_SYS_PATH, key)
+ LOG.debug("querying dmi data {0}".format(dmi_key))
try:
if not os.path.exists(dmi_key):
- LOG.debug("did not find {}".format(dmi_key))
+ LOG.debug("did not find {0}".format(dmi_key))
return None
key_data = load_file(dmi_key)
if not key_data:
- LOG.debug("{} did not return any data".format(key))
+ LOG.debug("{0} did not return any data".format(key))
return None
- LOG.debug("dmi data {} returned {}".format(dmi_key, key_data))
+ LOG.debug("dmi data {0} returned {0}".format(dmi_key, key_data))
return key_data.strip()
except Exception as e:
- logexc(LOG, "failed read of {}".format(dmi_key), e)
+ logexc(LOG, "failed read of {0}".format(dmi_key), e)
return None
@@ -2087,10 +2087,10 @@ def _call_dmidecode(key, dmidecode_path):
try:
cmd = [dmidecode_path, "--string", key]
(result, _err) = subp(cmd)
- LOG.debug("dmidecode returned '{}' for '{}'".format(result, key))
+ LOG.debug("dmidecode returned '{0}' for '{0}'".format(result, key))
return result
except OSError as _err:
- LOG.debug('failed dmidecode cmd: {}\n{}'.format(cmd, _err.message))
+ LOG.debug('failed dmidecode cmd: {0}\n{0}'.format(cmd, _err.message))
return None
@@ -2106,7 +2106,7 @@ def read_dmi_data(key):
if dmidecode_path:
return _call_dmidecode(key, dmidecode_path)
- LOG.warn("did not find either path {} or dmidecode command".format(
+ LOG.warn("did not find either path {0} or dmidecode command".format(
DMI_SYS_PATH))
return None