Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
693cfdea
Commit
693cfdea
authored
Nov 19, 2013
by
John Jarvis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
'ignore' shouldn't be use for ascii conversion
The input string is not expected to contain any unicode characters
parent
4067a084
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
cms/envs/aws.py
+1
-1
lms/envs/aws.py
+1
-1
No files found.
cms/envs/aws.py
View file @
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
...
...
lms/envs/aws.py
View file @
693cfdea
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment