From 4e7e6390d63a5151e4d8e69ca5cb3e552d93a0b9 Mon Sep 17 00:00:00 2001 From: Chris van Egmond Date: Fri, 24 Nov 2017 15:30:23 +1300 Subject: [PATCH] Remove magic STATIC_ROOT, MEDIA_ROOT and VAR_DIRECTORY overrides --- json_settings/__init__.py | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/json_settings/__init__.py b/json_settings/__init__.py index 74512ff..ad358c0 100644 --- a/json_settings/__init__.py +++ b/json_settings/__init__.py @@ -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: @@ -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: @@ -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()