From ffdeac3dcdb97064aff0e3d730e7f89b9e1339f9 Mon Sep 17 00:00:00 2001 From: Chris Dodge Date: Wed, 5 Jun 2013 14:31:32 -0400 Subject: [PATCH] seems like there's a Django bug and the SESSION_COOKIE_NAME needs to be an explicit str() --- cms/envs/aws.py | 3 ++- lms/envs/aws.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/cms/envs/aws.py b/cms/envs/aws.py index 63c7d533cd..af5f39631d 100644 --- a/cms/envs/aws.py +++ b/cms/envs/aws.py @@ -95,7 +95,8 @@ SESSION_COOKIE_DOMAIN = ENV_TOKENS.get('SESSION_COOKIE_DOMAIN') # this is to fix a bug regarding simultaneous logins between edx.org and edge.edx.org which can # happen with some browsers (e.g. Firefox) if ENV_TOKENS.get('SESSION_COOKIE_NAME', None): - SESSION_COOKIE_NAME = ENV_TOKENS.get('SESSION_COOKIE_NAME') + # NOTE, there's a bug in Django (http://bugs.python.org/issue18012) which necessitates this being a str() + SESSION_COOKIE_NAME = str(ENV_TOKENS.get('SESSION_COOKIE_NAME')) #Email overrides DEFAULT_FROM_EMAIL = ENV_TOKENS.get('DEFAULT_FROM_EMAIL', DEFAULT_FROM_EMAIL) diff --git a/lms/envs/aws.py b/lms/envs/aws.py index 588d9034db..47c10a45e9 100644 --- a/lms/envs/aws.py +++ b/lms/envs/aws.py @@ -106,7 +106,8 @@ SESSION_COOKIE_DOMAIN = ENV_TOKENS.get('SESSION_COOKIE_DOMAIN') # this is to fix a bug regarding simultaneous logins between edx.org and edge.edx.org which can # happen with some browsers (e.g. Firefox) if ENV_TOKENS.get('SESSION_COOKIE_NAME', None): - SESSION_COOKIE_NAME = ENV_TOKENS.get('SESSION_COOKIE_NAME') + # NOTE, there's a bug in Django (http://bugs.python.org/issue18012) which necessitates this being a str() + SESSION_COOKIE_NAME = str(ENV_TOKENS.get('SESSION_COOKIE_NAME')) BOOK_URL = ENV_TOKENS['BOOK_URL'] MEDIA_URL = ENV_TOKENS['MEDIA_URL']