diff --git a/colab/accounts/forms.py b/colab/accounts/forms.py
index 418a67f..0310863 100644
--- a/colab/accounts/forms.py
+++ b/colab/accounts/forms.py
@@ -12,8 +12,6 @@ from django.utils.encoding import force_bytes
from django.utils.http import urlsafe_base64_encode
from django.utils.text import capfirst
from django.utils.translation import ugettext_lazy as _
-from django.core.validators import validate_email
-from django.core.exceptions import ValidationError
from django.utils.safestring import mark_safe
from conversejs.models import XMPPAccount
@@ -66,10 +64,12 @@ class UserForm(forms.ModelForm):
email = self.cleaned_data.get('email')
username = self.cleaned_data.get('username')
- if email and User.objects.filter(email=email).exclude(
- username=username).count():
- raise forms.ValidationError(
- mark_safe("Try login in: sign in"))
+ user_qs = User.objects.filter(email=email).exclude(username=username)
+
+ if email and user_qs.exists():
+ msg = mark_safe("Try login in: sign in")
+ raise forms.ValidationError(msg)
+
return email
def clean_username(self):
diff --git a/colab/accounts/tests/test_forms.py b/colab/accounts/tests/test_forms.py
index 892b7d7..be6a323 100644
--- a/colab/accounts/tests/test_forms.py
+++ b/colab/accounts/tests/test_forms.py
@@ -2,12 +2,13 @@
Test Form class.
Objective: Test parameters, and behavior.
"""
+from re import search
+
+from django.test import TestCase
+
from colab.accounts.forms import UserForm
from colab.accounts.models import User
-from django.test import TestCase, Client
-from django import forms
-from django.core.exceptions import ValidationError
-from re import search
+
class FormTest(TestCase):
@@ -24,12 +25,12 @@ class FormTest(TestCase):
user.save()
def create_form_data(self):
- form_data = {'email': 'usertest@colab.com.br',
- 'first_name': 'colabName',
- 'last_name': 'secondName',
- 'username': 'colab',
- 'password1': '123colab4',
- 'password2': '123colab4'}
+ form_data = {'email': 'usertest@colab.com.br',
+ 'first_name': 'colabName',
+ 'last_name': 'secondName',
+ 'username': 'colab',
+ 'password1': '123colab4',
+ 'password2': '123colab4'}
form = UserForm(data=form_data)
return form
--
libgit2 0.21.2