Minor PEP8 changes

This commit is contained in:
Yoann Roman
2011-01-14 14:33:25 -05:00
parent 5ef0c4240b
commit 2fe8d97e4e

View File

@@ -3,9 +3,11 @@ import inspect
import os
import string
IDENTIFIER = re.compile(r'[a-z_](\w)*$', re.IGNORECASE)
STRING_FORMAT = re.compile(r'{pecan\.conf(?P<var>([.][a-z_][\w]*)+)+?}', re.IGNORECASE)
class ConfigString(object):
def __init__(self, format_string):
self.raw_string = format_string
@@ -37,6 +39,7 @@ class ConfigString(object):
def contains_formatting(value):
return STRING_FORMAT.match(value)
class Config(object):
def __init__(self, conf_dict={}):
self.update(conf_dict)
@@ -99,7 +102,6 @@ class Config(object):
return self
def conf_from_module(module):
if isinstance(module, str):
module = import_module(module)
@@ -108,6 +110,7 @@ def conf_from_module(module):
return conf_from_dict(module_dict)
def conf_from_file(filepath):
abspath = os.path.abspath(os.path.expanduser(filepath))
conf_dict = {}
@@ -117,6 +120,7 @@ def conf_from_file(filepath):
return conf_from_dict(conf_dict)
def conf_from_dict(conf_dict):
conf = Config()
@@ -138,6 +142,7 @@ def conf_from_dict(conf_dict):
conf()
return conf
def import_module(conf):
if conf.endswith('.py'):
conf = conf[:-3]
@@ -164,17 +169,20 @@ def import_module(conf):
return conf_mod
def initconf():
import default_config
conf = conf_from_module(default_config)
conf()
return conf
def set_config(name):
if '/' in name:
_runtime_conf.update(conf_from_file(name))
else:
_runtime_conf.update_with_module(name)
_runtime_conf = initconf()