Merge branch 'bug-750503-login_utf8_issue'

This commit is contained in:
Piotr Zalewa 2012-05-10 13:54:47 +02:00
Родитель 0dde026c3e 875e02df9f
Коммит e0f5016f95
1 изменённых файлов: 1 добавлений и 3 удалений

Просмотреть файл

@ -134,10 +134,8 @@ def browserid_authenticate(request, assertion):
amouser = AMOAuthentication.auth_browserid_authenticate(email)
except ValueError, err:
# Some issue with connecting to AMO let's not raise an error
# XXX: There is an error in logging - let's raise it for now
raise
log.error("[browserID] Error from AMO (%s): %s" % (email, str(err)))
mail_admins( 'Problem with browserID authentication', str(err))
log.error("[browserID] Error from AMO (%s): %s" % (email, str(err)))
except Http404, err:
# AMO responded with 404
log.error("[browserID] 404 Error from AMO: %s" % email)