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

Unicode fixes for log messages and other things

Browse Source
This commit is contained in:
Omar Al-Ithawi
2015-02-03 13:01:22 +02:00
parent 6266dcf1e7
commit 4e733c6e1f
13 changed files with 162 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
common/djangoapps/student/management/commands/assigngroups.py
View File

@@ -82,9 +82,11 @@ class Command(BaseCommand):
v = random.uniform(0, 1)
group = group_from_value(groups, v)
group_objects[group].users.add(user)
f.write("Assigned user {name} ({id}) to {group}\n".format(name=user.username,
id=user.id,
group=group))
f.write(u"Assigned user {name} ({id}) to {group}\n".format(
name=user.username,
id=user.id,
group=group
).encode('utf-8'))
## Save groups
for group in group_objects:

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

@@ -889,7 +889,12 @@ class CourseEnrollment(models.Model):
except: # pylint: disable=bare-except
if event_name and self.course_id:
log.exception('Unable to emit event %s for user %s and course %s', event_name, self.user.username, self.course_id)
log.exception(
u'Unable to emit event %s for user %s and course %s',
event_name,
self.user.username, # pylint: disable=no-member
self.course_id,
)
@classmethod
def enroll(cls, user, course_key, mode="honor", check_access=False):
@@ -930,10 +935,9 @@ class CourseEnrollment(models.Model):
course = modulestore().get_course(course_key)
except ItemNotFoundError:
log.warning(
"User {0} failed to enroll in non-existent course {1}".format(
user.username,
course_key.to_deprecated_string()
)
u"User %s failed to enroll in non-existent course %s",
user.username,
course_key.to_deprecated_string(),
)
raise NonExistentCourseError
@@ -942,27 +946,24 @@ class CourseEnrollment(models.Model):
raise NonExistentCourseError
if CourseEnrollment.is_enrollment_closed(user, course):
log.warning(
"User {0} failed to enroll in course {1} because enrollment is closed".format(
user.username,
course_key.to_deprecated_string()
)
u"User %s failed to enroll in course %s because enrollment is closed",
user.username,
course_key.to_deprecated_string()
)
raise EnrollmentClosedError
if CourseEnrollment.is_course_full(course):
log.warning(
"User {0} failed to enroll in full course {1}".format(
user.username,
course_key.to_deprecated_string()
)
u"User %s failed to enroll in full course %s",
user.username,
course_key.to_deprecated_string(),
)
raise CourseFullError
if CourseEnrollment.is_enrolled(user, course_key):
log.warning(
"User {0} attempted to enroll in {1}, but they were already enrolled".format(
user.username,
course_key.to_deprecated_string()
)
u"User %s attempted to enroll in %s, but they were already enrolled",
user.username,
course_key.to_deprecated_string()
)
if check_access:
raise AlreadyEnrolledError
@@ -1029,8 +1030,8 @@ class CourseEnrollment(models.Model):
record.update_enrollment(is_active=False, skip_refund=skip_refund)
except cls.DoesNotExist:
err_msg = u"Tried to unenroll student {} from {} but they were not enrolled"
log.error(err_msg.format(user, course_id))
err_msg = u"Tried to unenroll student %s from %s but they were not enrolled"
log.error(err_msg, user, course_id)
@classmethod
def unenroll_by_email(cls, email, course_id):
@@ -1046,8 +1047,8 @@ class CourseEnrollment(models.Model):
user = User.objects.get(email=email)
return cls.unenroll(user, course_id)
except User.DoesNotExist:
err_msg = u"Tried to unenroll email {} from course {}, but user not found"
log.error(err_msg.format(email, course_id))
err_msg = u"Tried to unenroll email %s from course %s, but user not found"
log.error(err_msg, user, course_id)
@classmethod
def is_enrolled(cls, user, course_key):

18
common/djangoapps/student/views.py
View File

@@ -338,7 +338,7 @@ def _cert_info(user, course, cert_status):
if status == 'ready':
if 'download_url' not in cert_status:
log.warning("User %s has a downloadable cert for %s, but no download url",
log.warning(u"User %s has a downloadable cert for %s, but no download url",
user.username, course.id)
return default_info
else:
@@ -841,13 +841,11 @@ def change_enrollment(request, check_access=True):
try:
course_id = SlashSeparatedCourseKey.from_deprecated_string(request.POST.get("course_id"))
except InvalidKeyError:
log.warning(
"User {username} tried to {action} with invalid course id: {course_id}".format(
username=user.username,
action=action,
course_id=request.POST.get("course_id")
)
)
log.warning(u"User %(username)s tried to %(action)s with invalid course id: %(course_id)s", {
"username": user.username,
"action": action,
"course_id": request.POST.get("course_id"),
})
return HttpResponseBadRequest(_("Invalid course id"))
if action == "enroll":
@@ -1248,11 +1246,11 @@ def disable_account_ajax(request):
if account_action == 'disable':
user_account.account_status = UserStanding.ACCOUNT_DISABLED
context['message'] = _("Successfully disabled {}'s account").format(username)
log.info("{} disabled {}'s account".format(request.user, username))
log.info(u"%s disabled %s's account", request.user, username)
elif account_action == 'reenable':
user_account.account_status = UserStanding.ACCOUNT_ENABLED
context['message'] = _("Successfully reenabled {}'s account").format(username)
log.info("{} reenabled {}'s account".format(request.user, username))
log.info(u"%s reenabled %s's account", request.user, username)
else:
context['message'] = _("Unexpected account status")
return JsonResponse(context, status=400)