From 09c63134886938cdd9a1307711abe73ade21638b Mon Sep 17 00:00:00 2001
From: msfernandes <matheus.souza.fernandes@gmail.com>
Date: Mon, 12 Jan 2015 17:25:48 -0200
Subject: [PATCH] Applied flake8 into accounts models and tests files

---
 colab/accounts/models.py             |   7 ++-----
 colab/accounts/tests/test_request.py |   8 ++------
 colab/accounts/tests/test_user.py    |  99 +++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------
 3 files changed, 51 insertions(+), 63 deletions(-)

diff --git a/colab/accounts/models.py b/colab/accounts/models.py
index 6c348b1..f10a96a 100644
--- a/colab/accounts/models.py
+++ b/colab/accounts/models.py
@@ -2,15 +2,12 @@
 
 import urlparse
 
-from django.db import models, DatabaseError
-from django.contrib.auth.hashers import check_password
+from django.db import models
 from django.contrib.auth.models import AbstractUser
 from django.core import validators
 from django.core.urlresolvers import reverse
 from django.utils.translation import ugettext_lazy as _
 
-from conversejs import xmpp
-
 from .utils import mailman
 
 
@@ -25,7 +22,7 @@ class User(AbstractUser):
     facebook = models.CharField(max_length=128, null=True, blank=True)
     google_talk = models.EmailField(null=True, blank=True)
     github = models.CharField(max_length=128, null=True, blank=True,
-                                 verbose_name=u'github')
+                              verbose_name=u'github')
     webpage = models.CharField(max_length=256, null=True, blank=True)
     verification_hash = models.CharField(max_length=32, null=True, blank=True)
     modified = models.DateTimeField(auto_now=True)
diff --git a/colab/accounts/tests/test_request.py b/colab/accounts/tests/test_request.py
index 3fddedb..d16d99b 100644
--- a/colab/accounts/tests/test_request.py
+++ b/colab/accounts/tests/test_request.py
@@ -5,12 +5,8 @@ Objective: Test requests.
 
 from django.test import TestCase, Client
 from django.test.client import RequestFactory
-from django.contrib.messages.storage.fallback import FallbackStorage
-from colab.accounts.views import ManageUserSubscriptionsView
-from colab.accounts.views import UserProfileDetailView
 from colab.accounts.models import User
-from django.http.response import Http404
-from colab.accounts.views import signup
+
 
 class RequestTest(TestCase):
 
@@ -22,7 +18,7 @@ class RequestTest(TestCase):
         # TODO
         pass
 
-    def test_invalid_user_profile_url(self):            
+    def test_invalid_user_profile_url(self):
         response = self.client.get('/account/johndoe/')
         self.assertEqual(404, response.status_code)
 
diff --git a/colab/accounts/tests/test_user.py b/colab/accounts/tests/test_user.py
index 37adaec..ad40aa7 100644
--- a/colab/accounts/tests/test_user.py
+++ b/colab/accounts/tests/test_user.py
@@ -3,59 +3,54 @@ Test User class.
 Objective: Test parameters, and behavior.
 """
 from colab.accounts.models import User
-from django.test import TestCase, Client
+from django.test import TestCase
 
 
 class UserTest(TestCase):
-  
-  def setUp(self):
-    self.user = self.create_user()
-
-
-  def create_user(self):
-    user = User()
-    user.username = "USERtestCoLaB"
-    user.set_password("123colab4")
-    user.email = "usertest@colab.com.br"
-    user.id = 1
-    user.twitter = "usertestcolab"
-    user.facebook = "usertestcolab"
-    user.save()
-
-    return user
-
-  def test_check_password(self):
-    self.assertTrue(self.user.check_password("123colab4"))
-    self.assertFalse(self.user.check_password("1234"))
-
-  def test_get_absolute_url(self):
-    url = self.user.get_absolute_url()
-    self.assertEqual("/account/usertestcolab", url)
-
-
-  def test_twitter_link(self):
-    link_twitter = self.user.twitter_link()
-    self.assertEqual('https://twitter.com/usertestcolab', link_twitter)
-  
-  def test_facebook_link(self):
-    link_facebook = self.user.facebook_link()
-    self.assertEqual('https://www.facebook.com/usertestcolab', link_facebook)
-  
-
-  def test_mailinglists(self):
-    empty_list = ()
-    self.assertEqual(empty_list, self.user.mailinglists())
-    
-
-  def test_update_subscription(self):
-    pass
-    # TODO: You should have mailman connection.
-
-  def test_save(self):
-    username_test = "USERtestCoLaB"
-
-    user_db = User.objects.get(id=1)
-    self.assertEqual(user_db.username, username_test.lower())
-    self.user.delete()
-    
 
+    def setUp(self):
+        self.user = self.create_user()
+
+    def create_user(self):
+        user = User()
+        user.username = "USERtestCoLaB"
+        user.set_password("123colab4")
+        user.email = "usertest@colab.com.br"
+        user.id = 1
+        user.twitter = "usertestcolab"
+        user.facebook = "usertestcolab"
+        user.save()
+
+        return user
+
+    def test_check_password(self):
+        self.assertTrue(self.user.check_password("123colab4"))
+        self.assertFalse(self.user.check_password("1234"))
+
+    def test_get_absolute_url(self):
+        url = self.user.get_absolute_url()
+        self.assertEqual("/account/usertestcolab", url)
+
+    def test_twitter_link(self):
+        link_twitter = self.user.twitter_link()
+        self.assertEqual('https://twitter.com/usertestcolab', link_twitter)
+
+    def test_facebook_link(self):
+        link_facebook = self.user.facebook_link()
+        self.assertEqual('https://www.facebook.com/usertestcolab',
+                         link_facebook)
+
+    def test_mailinglists(self):
+        empty_list = ()
+        self.assertEqual(empty_list, self.user.mailinglists())
+
+    def test_update_subscription(self):
+        pass
+        # TODO: You should have mailman connection.
+
+    def test_save(self):
+        username_test = "USERtestCoLaB"
+
+        user_db = User.objects.get(id=1)
+        self.assertEqual(user_db.username, username_test.lower())
+        self.user.delete()
--
libgit2 0.21.2