From a8dd9ca99dff86a3f2530a84382b7ac7a89cdded Mon Sep 17 00:00:00 2001
From: Ned Batchelder <ned@edx.org>
Date: Thu, 13 Aug 2015 06:11:52 -0400
Subject: [PATCH] Use the proper 'off' default for COMP_THEME_DIR.
---
lms/envs/common.py | 2 +-
pavelib/assets.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/lms/envs/common.py b/lms/envs/common.py
index 9eed45bba32..5d53cbbd175 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -452,7 +452,7 @@ COURSES_ROOT = ENV_ROOT / "data"
DATA_DIR = COURSES_ROOT
# comprehensive theming system
-COMP_THEME_DIR = None
+COMP_THEME_DIR = ""
# TODO: Remove the rest of the sys.path modification here and in cms/envs/common.py
sys.path.append(REPO_ROOT)
diff --git a/pavelib/assets.py b/pavelib/assets.py
index 08904d2659a..cabd6e515e7 100644
--- a/pavelib/assets.py
+++ b/pavelib/assets.py
@@ -45,7 +45,7 @@ def configure_paths():
css_dir.mkdir_p()
SASS_DIRS.append(sass_dir)
- if edxapp_env.env_tokens.get("COMP_THEME_DIR", None):
+ if edxapp_env.env_tokens.get("COMP_THEME_DIR", ""):
theme_dir = path(edxapp_env.env_tokens["COMP_THEME_DIR"])
lms_sass = theme_dir / "lms" / "static" / "sass"
lms_css = theme_dir / "lms" / "static" / "css"
--
GitLab