Merge commit 'e52c9b51' into jbau/edx-west/rc-merge-20140213

common/djangoapps/student/views.py

@@ -978,12 +978,12 @@ def _do_create_account(post_vars):
         if len(User.objects.filter(username=post_vars['username'])) > 0:
             js['value'] = _("An account with the Public Username '{username}' already exists.").format(username=post_vars['username'])
             js['field'] = 'username'
-            return HttpResponse(json.dumps(js))
+            return JsonResponse(js, status=400)
 
         if len(User.objects.filter(email=post_vars['email'])) > 0:
             js['value'] = _("An account with the Email '{email}' already exists.").format(email=post_vars['email'])
             js['field'] = 'email'
-            return HttpResponse(json.dumps(js))
+            return JsonResponse(js, status=400)
 
         raise
 

lms/djangoapps/verify_student/models.py

@@ -42,7 +42,7 @@ log = logging.getLogger(__name__)
 
 def generateUUID():  # pylint: disable=C0103
     """ Utility function; generates UUIDs """
-    return str(uuid.uuid4)
+    return str(uuid.uuid4())
 
 
 class VerificationException(Exception):
@@ -142,7 +142,7 @@ class PhotoVerification(StatusModel):
     # user IDs or something too easily guessable.
     receipt_id = models.CharField(
         db_index=True,
-        default=generateUUID,
+        default=lambda: generateUUID(),
         max_length=255,
     )