From 60571f66adeaaccc097a94054bc2579fd9724788 Mon Sep 17 00:00:00 2001 From: Rory Finnegan Date: Tue, 8 Apr 2014 11:56:27 -0500 Subject: [PATCH] Fixed formatting standards on files I've changed. Used command `find . -name '*.py' | grep -v minify_json | xargs pep8 --ignore=E101,E221,E241,E501,W191` --- bootstrapvz/common/tools.py | 6 ++++-- setup.py | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/bootstrapvz/common/tools.py b/bootstrapvz/common/tools.py index d40eaab..f392f35 100644 --- a/bootstrapvz/common/tools.py +++ b/bootstrapvz/common/tools.py @@ -63,18 +63,21 @@ def load_json(path): with open(path) as stream: return json.loads(json_minify(stream.read(), False)) + def load_yaml(path): import yaml with open(path, 'r') as fobj: return yaml.load(fobj) + def config_get(path, config_path): config = load_json(path) for key in config_path: config = config.get(key) return config -def copy_tree(from_path,to_path): + +def copy_tree(from_path, to_path): from shutil import copy import os for abs_prefix, dirs, files in os.walk(from_path): @@ -90,4 +93,3 @@ def copy_tree(from_path,to_path): for path in files: copy(os.path.join(abs_prefix, path), os.path.join(to_path, prefix, path)) - diff --git a/setup.py b/setup.py index a3e61ca..20d6568 100644 --- a/setup.py +++ b/setup.py @@ -19,7 +19,7 @@ setup(name='bootstrap-vz', install_requires=['termcolor >= 1.1.0', 'fysom >= 1.0.15', 'jsonschema >= 2.3.0', - 'pyyaml >= 3.10', + 'pyyaml >= 3.10', ], license='Apache License, Version 2.0', description='Bootstrap Debian images for virtualized environments',