diff --git a/runtests.py b/runtests.py index 536a5ded..b358418d 100755 --- a/runtests.py +++ b/runtests.py @@ -7,6 +7,7 @@ import pytest def main(): os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings.test") sys.path.insert(0, "examples/simple") + sys.path.insert(0, "src") return pytest.main() diff --git a/scripts/pylint.sh b/scripts/pylint.sh index 06edc8b7..2b9aa8e7 100755 --- a/scripts/pylint.sh +++ b/scripts/pylint.sh @@ -1 +1,2 @@ +reset pylint src/fobi/ diff --git a/src/fobi/conf.py b/src/fobi/conf.py index a0fc6cec..b519e3b6 100644 --- a/src/fobi/conf.py +++ b/src/fobi/conf.py @@ -20,9 +20,12 @@ def get_setting(setting, override=None): None. :return: Setting value. """ - if override is not None: - return override - if hasattr(settings, 'FOBI_{0}'.format(setting)): - return getattr(settings, 'FOBI_{0}'.format(setting)) + attr_name = 'FOBI_{0}'.format(setting) + if hasattr(settings, attr_name): + return getattr(settings, attr_name) else: - return getattr(defaults, setting) + if hasattr(defaults, setting): + return getattr(defaults, setting) + else: + return override +