Commit 7a24f203 by John Jarvis

Merge pull request #1718 from edx/jarv/fix-static-url

'ignore' shouldn't be use for ascii conversion
parents 745f4509 693cfdea
...@@ -90,7 +90,7 @@ with open(CONFIG_ROOT / CONFIG_PREFIX + "env.json") as env_file: ...@@ -90,7 +90,7 @@ with open(CONFIG_ROOT / CONFIG_PREFIX + "env.json") as env_file:
STATIC_URL_BASE = ENV_TOKENS.get('STATIC_URL_BASE', None) STATIC_URL_BASE = ENV_TOKENS.get('STATIC_URL_BASE', None)
if STATIC_URL_BASE: if STATIC_URL_BASE:
# collectstatic will fail if STATIC_URL is a unicode string # collectstatic will fail if STATIC_URL is a unicode string
STATIC_URL = STATIC_URL_BASE.encode('ascii', 'ignore') + "/" + git.revision + "/" STATIC_URL = STATIC_URL_BASE.encode('ascii') + "/" + git.revision + "/"
# GITHUB_REPO_ROOT is the base directory # GITHUB_REPO_ROOT is the base directory
# for course data # for course data
......
...@@ -113,7 +113,7 @@ if STATIC_ROOT_BASE: ...@@ -113,7 +113,7 @@ if STATIC_ROOT_BASE:
STATIC_URL_BASE = ENV_TOKENS.get('STATIC_URL_BASE', None) STATIC_URL_BASE = ENV_TOKENS.get('STATIC_URL_BASE', None)
if STATIC_URL_BASE: if STATIC_URL_BASE:
# collectstatic will fail if STATIC_URL is a unicode string # collectstatic will fail if STATIC_URL is a unicode string
STATIC_URL = STATIC_URL_BASE.encode('ascii', 'ignore') + "/" STATIC_URL = STATIC_URL_BASE.encode('ascii') + "/"
PLATFORM_NAME = ENV_TOKENS.get('PLATFORM_NAME', PLATFORM_NAME) PLATFORM_NAME = ENV_TOKENS.get('PLATFORM_NAME', PLATFORM_NAME)
# For displaying on the receipt. At Stanford PLATFORM_NAME != MERCHANT_NAME, but PLATFORM_NAME is a fine default # For displaying on the receipt. At Stanford PLATFORM_NAME != MERCHANT_NAME, but PLATFORM_NAME is a fine default
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment