summaryrefslogtreecommitdiff
path: root/cloudinit
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2012-01-12 16:49:50 +0100
committerScott Moser <smoser@ubuntu.com>2012-01-12 16:49:50 +0100
commit209a7528fcedd236a99011f895a41620615e3d99 (patch)
tree7538c7bbe21fa75ff0cee081533d4f9d4a80112b /cloudinit
parent029ac0b55f686180167fa3c929fb41ad3574b656 (diff)
downloadvyos-cloud-init-209a7528fcedd236a99011f895a41620615e3d99.tar.gz
vyos-cloud-init-209a7528fcedd236a99011f895a41620615e3d99.zip
[PATCH 02/13] Fix pylint warnings W0312 (found indentation with tabs
instead of spaces) From: Juerg Haefliger <juerg.haefliger@hp.com>
Diffstat (limited to 'cloudinit')
-rw-r--r--cloudinit/util.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/cloudinit/util.py b/cloudinit/util.py
index 8409c586..b45bb19e 100644
--- a/cloudinit/util.py
+++ b/cloudinit/util.py
@@ -39,10 +39,10 @@ except ImportError:
def read_conf(fname):
try:
- stream = open(fname,"r")
- conf = yaml.load(stream)
- stream.close()
- return conf
+ stream = open(fname,"r")
+ conf = yaml.load(stream)
+ stream.close()
+ return conf
except IOError as e:
if e.errno == errno.ENOENT:
return { }
@@ -282,7 +282,7 @@ def read_file_with_includes(fname, rel = ".", stack=[], patt = None):
else:
raise
contents = contents[0:loc] + inc_contents + contents[endl+1:]
- cur = loc + len(inc_contents)
+ cur = loc + len(inc_contents)
stack.pop()
return(contents)