Merge pull request #21296 from edx/BOM-78

BOM-78
2019-08-06 18:49:19 +05:00
parent 3f2bd0a020 2244540ade
commit e5f3da9afa
3 changed files with 4 additions and 4 deletions
--- a/common/djangoapps/student/tests/factories.py
+++ b/common/djangoapps/student/tests/factories.py
@@ -69,7 +69,7 @@ class RegistrationFactory(DjangoModelFactory):
        model = Registration

    user = None
-    activation_key = uuid4().hex.decode('ascii')
+    activation_key = six.text_type(uuid4().hex)


 class UserFactory(DjangoModelFactory):