From f03081d04fbb1697d6d59615d0846213224887b2 Mon Sep 17 00:00:00 2001
From: Josue Balandrano Coronel <jbc@rmcomplexity.com>
Date: Mon, 8 Apr 2019 10:07:00 -0500
Subject: [PATCH] Check if username is already unicode.

---
 common/djangoapps/student/models.py | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/common/djangoapps/student/models.py b/common/djangoapps/student/models.py
index 44352ab77c..988bbeb12b 100644
--- a/common/djangoapps/student/models.py
+++ b/common/djangoapps/student/models.py
@@ -921,8 +921,13 @@ class LoginFailures(models.Model):
         if self.lockout_until is not None:
             date_str = self.lockout_until.isoformat()
 
+        try:
+            username = unicode(self.user.username, 'utf-8')
+        except TypeError:
+            username = self.user.username
+
         return u'LoginFailures({username}, {count}, {date})'.format(
-            username=six.text_type(self.user.username, 'utf-8'),
+            username=username,
             count=self.failure_count,
             date=date_str
         )
@@ -933,8 +938,13 @@ class LoginFailures(models.Model):
         if self.lockout_until is not None:
             date_str = self.lockout_until.isoformat()
 
+        try:
+            username = unicode(self.user.username, 'utf-8')
+        except TypeError:
+            username = self.user.username
+
         return u'{username}: {count} - {date}'.format(
-            username=six.text_type(self.user.username, 'utf-8'),
+            username=username,
             count=self.failure_count,
             date=date_str
         )