Skip to content
This repository has been archived by the owner on Mar 8, 2021. It is now read-only.

Remove magic STATIC_ROOT, MEDIA_ROOT and VAR_DIRECTORY overrides #3

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove magic STATIC_ROOT, MEDIA_ROOT and VAR_DIRECTORY overrides #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 5 additions & 13 deletions json_settings/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@

import sys
import os
import logging
import json


def json_patch(path):
logging.info("Attempting to load local settings from %r" %(path,))
logging.info("Attempting to load local settings from %r" % (path,))
try:
d = json.load(open(path))
except IOError:
Expand All @@ -14,9 +14,10 @@ def json_patch(path):
except ValueError:
logging.exception("Unable to parse json settings in %r" % (path,))
raise SystemExit(-1)
for k,v in d.items():
for k, v in d.items():
globals()[k] = v


def patch_settings():
env_settings = os.environ.get('JSON_SETTINGS', None)
if env_settings is None:
Expand All @@ -25,15 +26,6 @@ def patch_settings():
if not os.path.exists(env_settings):
return
json_patch(env_settings)
if not "VAR_DIRECTORY" in globals():
globals()["VAR_DIRECTORY"] = os.path.join(sys.prefix, "var")
if not "STATIC_ROOT" in globals():
globals()["STATIC_ROOT"] = os.path.join(globals()["VAR_DIRECTORY"],
"static")
if not "MEDIA_ROOT" in globals():
globals()["MEDIA_ROOT"] = os.path.join(globals()["VAR_DIRECTORY"],
"media")


patch_settings()

patch_settings()