From 2638651088dc2adb9995acc9ebd19e42e19ec423 Mon Sep 17 00:00:00 2001
From: virusdefender <1670873886@qq.com>
Date: Sat, 10 Oct 2015 19:33:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=BC=E5=AE=B9=E9=83=A8=E5=88=86=E8=80=81?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=EF=BC=8C=E6=9C=89=E9=82=AE=E7=AE=B1=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 account/views.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/account/views.py b/account/views.py
index 1550ff7..03ff442 100644
--- a/account/views.py
+++ b/account/views.py
@@ -5,6 +5,7 @@ from django.contrib import auth
 from django.shortcuts import render
 from django.db.models import Q
 from django.conf import settings
+from django.core.exceptions import MultipleObjectsReturned
 
 from rest_framework.views import APIView
 from rest_framework.response import Response
@@ -89,6 +90,9 @@ class UserRegisterAPIView(APIView):
             try:
                 User.objects.get(email=data["email"])
                 return error_response(u"该邮箱已被注册，请换其他邮箱进行注册")
+            # 兼容部分老数据，有邮箱重复的
+            except MultipleObjectsReturned:
+                return error_response(u"该邮箱已被注册，请换其他邮箱进行注册")
             except User.DoesNotExist:
                 user = User.objects.create(username=data["username"], real_name=data["real_name"],
                                            email=data["email"])
@@ -152,7 +156,7 @@ class EmailCheckAPIView(APIView):
             try:
                 User.objects.get(email=email)
                 return Response(status=400)
-            except User.DoesNotExist:
+            except Exception:
                 return Response(status=200)
         return Response(status=200)