Merge pull request #19751 from edx/unicode10

enable unicode format string linter
This commit is contained in:
Calen Pennington
2019-02-21 06:07:11 -05:00
committed by GitHub
28 changed files with 113 additions and 83 deletions

View File

@@ -47,13 +47,13 @@ def send_grade_if_interesting(user, course_run_key, mode, status, letter_grade,
if verbose:
msg = u"Starting send_grade_if_interesting with params: "\
"user [{username}], "\
"course_run_key [{key}], "\
"mode [{mode}], "\
"status [{status}], "\
"letter_grade [{letter_grade}], "\
"percent_grade [{percent_grade}], "\
"verbose [{verbose}]"\
u"user [{username}], "\
u"course_run_key [{key}], "\
u"mode [{mode}], "\
u"status [{status}], "\
u"letter_grade [{letter_grade}], "\
u"percent_grade [{percent_grade}], "\
u"verbose [{verbose}]"\
.format(
username=getattr(user, 'username', None),
key=str(course_run_key),

View File

@@ -84,12 +84,12 @@ def handle_course_cert_changed(sender, user, course_key, mode, status, **kwargs)
verbose = kwargs.get('verbose', False)
if verbose:
msg = u"Starting handle_course_cert_changed with params: "\
"sender [{sender}], "\
"user [{username}], "\
"course_key [{course_key}], "\
"mode [{mode}], "\
"status [{status}], "\
"kwargs [{kw}]"\
u"sender [{sender}], "\
u"user [{username}], "\
u"course_key [{course_key}], "\
u"mode [{mode}], "\
u"status [{status}], "\
u"kwargs [{kw}]"\
.format(
sender=sender,
username=getattr(user, 'username', None),

View File

@@ -25,7 +25,7 @@ class RetirementQueueDeletionForm(forms.Form):
# Translators: 'current_state' is a string from an enumerated list indicating the learner's retirement
# state. Example: FORUMS_COMPLETE
u"Retirement requests can only be cancelled for users in the PENDING state."
" Current request state for '{original_username}': {current_state}".format(
u" Current request state for '{original_username}': {current_state}".format(
original_username=retirement.original_username,
current_state=retirement.current_state.state_name
)

View File

@@ -57,7 +57,7 @@ class Command(BaseCommand):
if retirement.user.email != old_retired_email:
print(
u'WARNING: Skipping UserRetirementStatus ID {} / User ID {} because the user does not appear to '
'have a retired email address: {}.'.format(
u'have a retired email address: {}.'.format(
retirement.id,
retirement.user.id,
retirement.user.email,

View File

@@ -99,4 +99,8 @@ class Command(BaseCommand):
end += chunk_size
sleep(sleep_time_secs)
print('Finished! Updated {} total preferences from {} to {}'.format(updated_count, old_lang_code, new_lang_code))
print(u'Finished! Updated {} total preferences from {} to {}'.format(
updated_count,
old_lang_code,
new_lang_code
))

View File

@@ -33,7 +33,7 @@ def delete_rows(model_mgr,
# The "as id" below fools Django raw query into thinking the primary key is being queried.
# It's necessary because Django will throw an exception if the raw SQL does not query the primary key.
min_max_ids = model_mgr.raw(
'SELECT MIN({}) as id, MAX({}) as max_id FROM {}'.format(primary_id_name, primary_id_name, table_name)
u'SELECT MIN({}) as id, MAX({}) as max_id FROM {}'.format(primary_id_name, primary_id_name, table_name)
)[0]
min_id = min_max_ids.id
max_id = min_max_ids.max_id