summaryrefslogtreecommitdiff
path: root/cloudinit/stages.py
diff options
context:
space:
mode:
authorRyan Harper <ryan.harper@canonical.com>2016-03-03 17:16:13 -0600
committerRyan Harper <ryan.harper@canonical.com>2016-03-03 17:16:13 -0600
commit63357ed731710b2418810535d9c991adbaea8dcb (patch)
tree5c553b0671669beb204c4edb3d82ebeda78d7cd3 /cloudinit/stages.py
parentb1046db66bbed6a063f218992449b8abfd1ae99b (diff)
parent3d9153d16b194e7a3139c290e723ef17518e617d (diff)
downloadvyos-cloud-init-63357ed731710b2418810535d9c991adbaea8dcb.tar.gz
vyos-cloud-init-63357ed731710b2418810535d9c991adbaea8dcb.zip
Apply pep8, pyflakes fixes for python2 and 3
Update make check target to use pep8, pyflakes, pyflakes3.
Diffstat (limited to 'cloudinit/stages.py')
-rw-r--r--cloudinit/stages.py18
1 files changed, 9 insertions, 9 deletions
diff --git a/cloudinit/stages.py b/cloudinit/stages.py
index 9f192c8d..dbcf3d55 100644
--- a/cloudinit/stages.py
+++ b/cloudinit/stages.py
@@ -509,13 +509,13 @@ class Init(object):
def consume_data(self, frequency=PER_INSTANCE):
# Consume the userdata first, because we need want to let the part
# handlers run first (for merging stuff)
- with events.ReportEventStack(
- "consume-user-data", "reading and applying user-data",
- parent=self.reporter):
+ with events.ReportEventStack("consume-user-data",
+ "reading and applying user-data",
+ parent=self.reporter):
self._consume_userdata(frequency)
- with events.ReportEventStack(
- "consume-vendor-data", "reading and applying vendor-data",
- parent=self.reporter):
+ with events.ReportEventStack("consume-vendor-data",
+ "reading and applying vendor-data",
+ parent=self.reporter):
self._consume_vendordata(frequency)
# Perform post-consumption adjustments so that
@@ -655,7 +655,7 @@ class Modules(object):
else:
raise TypeError(("Failed to read '%s' item in config,"
" unknown type %s") %
- (item, type_utils.obj_name(item)))
+ (item, type_utils.obj_name(item)))
return module_list
def _fixup_modules(self, raw_mods):
@@ -762,8 +762,8 @@ class Modules(object):
if skipped:
LOG.info("Skipping modules %s because they are not verified "
- "on distro '%s'. To run anyway, add them to "
- "'unverified_modules' in config.", skipped, d_name)
+ "on distro '%s'. To run anyway, add them to "
+ "'unverified_modules' in config.", skipped, d_name)
if forced:
LOG.info("running unverified_modules: %s", forced)