From 209a7528fcedd236a99011f895a41620615e3d99 Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Thu, 12 Jan 2012 16:49:50 +0100 Subject: [PATCH 02/13] Fix pylint warnings W0312 (found indentation with tabs instead of spaces) From: Juerg Haefliger --- cloudinit/util.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'cloudinit') 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) -- cgit v1.2.3