Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #12746 from edx/adam/fix-error-message

Browse Source 
make error message more readable
This commit is contained in:
Adam
2016-06-14 15:36:52 -04:00
committed by GitHub
parent b8fbab67d4 44636fe62d
commit 147bb014b9
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
common/djangoapps/student/models.py
View File

@@ -127,7 +127,7 @@ def anonymous_id_for_user(user, course_id, save=True):
hasher.update(settings.SECRET_KEY) hasher.update(settings.SECRET_KEY)
hasher.update(unicode(user.id)) hasher.update(unicode(user.id))
if course_id: if course_id:
hasher.update(course_id.to_deprecated_string().encode('utf-8')) hasher.update(unicode(course_id).encode('utf-8'))
digest = hasher.hexdigest() digest = hasher.hexdigest()
if not hasattr(user, '_anonymous_id'): if not hasattr(user, '_anonymous_id'):
@@ -146,12 +146,14 @@ def anonymous_id_for_user(user, course_id, save=True):
) )
if anonymous_user_id.anonymous_user_id != digest: if anonymous_user_id.anonymous_user_id != digest:
log.error( log.error(
u"Stored anonymous user id %r for user %r " u"Stored anonymous user id %(anonymous_user_id)r for "
u"in course %r doesn't match computed id %r", u"user %(user)r in course %(course_id)r doesn't match "
user, u"computed id %(digest)r", {
course_id, "anonymous_user_id": anonymous_user_id.anonymous_user_id,
anonymous_user_id.anonymous_user_id, "user": user,
digest "course_id": course_id,
"digest": digest,
}
) )
except IntegrityError: except IntegrityError:
# Another thread has already created this entry, so # Another thread has already created this entry, so