Hopiu/django-fobi
1
0
Fork 0
mirror of https://github.com/Hopiu/django-fobi.git synced 2026-03-16 22:10:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleanup

Browse source
This commit is contained in:
Artur Barseghyan 2016-12-19 00:37:58 +01:00
parent 06b9af2921
commit d2b702aac8
3 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
runtests.py
View file

@ -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()

1
scripts/pylint.sh
View file

@ -1 +1,2 @@
reset
pylint src/fobi/

13
src/fobi/conf.py
View file

@ -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