diff options
author | Todd Willey <todd@ansolabs.com> | 2011-01-17 13:44:52 -0500 |
---|---|---|
committer | Todd Willey <todd@ansolabs.com> | 2011-01-17 13:44:52 -0500 |
commit | e88bd8cd04b32818f693910fac772016a542e1da (patch) | |
tree | 2a41ae0e0d43c24acc07c872abff74a84326a677 /nova/wsgi.py | |
parent | 12a6e44015dfb761f9a5212525d2927a27f73813 (diff) | |
parent | 500b268d0ef83b4770f9883690564e458cf94247 (diff) | |
download | nova-e88bd8cd04b32818f693910fac772016a542e1da.tar.gz nova-e88bd8cd04b32818f693910fac772016a542e1da.tar.xz nova-e88bd8cd04b32818f693910fac772016a542e1da.zip |
Merge pep8 fixes from wsgirouter branch.
Diffstat (limited to 'nova/wsgi.py')
-rw-r--r-- | nova/wsgi.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/nova/wsgi.py b/nova/wsgi.py index 97c5f2d46..40019aa43 100644 --- a/nova/wsgi.py +++ b/nova/wsgi.py @@ -443,9 +443,10 @@ class Serializer(object): result.appendChild(node) return result + def paste_config_file(basename): """Find the best location in the system for a paste config file. - + Search Order ------------ @@ -474,6 +475,7 @@ def paste_config_file(basename): if os.path.exists(configfile): return configfile + def load_paste_configuration(filename, appname): """Returns a paste configuration dict, or None.""" filename = os.path.abspath(filename) @@ -484,6 +486,7 @@ def load_paste_configuration(filename, appname): pass return config + def load_paste_app(filename, appname): """Builds a wsgi app from a paste config, None if app not configured.""" filename = os.path.abspath(filename) @@ -494,8 +497,9 @@ def load_paste_app(filename, appname): pass return app + def paste_config_to_flags(config, mixins): - for k,v in mixins.iteritems(): + for k, v in mixins.iteritems(): value = config.get(k, v) converted_value = FLAGS[k].parser.Parse(value) setattr(FLAGS, k, converted_value) |