Clean out stuff

ccdb/users/admin.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
-
 from django import forms
 from django.contrib import admin
 from django.contrib.auth.admin import UserAdmin as AuthUserAdmin

ccdb/users/models.py

@@ -1,9 +1,7 @@
-# -*- coding: utf-8 -*-
 from django.contrib.auth.models import AbstractUser
 from django.core.urlresolvers import reverse
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
-from django.conf import settings
 
 import pytz
 
@@ -11,8 +9,9 @@ import pytz
 class User(AbstractUser):
     name = models.CharField(_("Name of User"), blank=True, max_length=255)
     timezone = models.CharField(_("Current Timezone"), max_length=255,
-        default="UTC", choices=[(x, x) for x in pytz.common_timezones],
-        blank=False)
+                                default="UTC",
+                                choices=[(x, x) for x in pytz.common_timezones],
+                                blank=False)
 
     def __str__(self):
         return self.username

ccdb/users/tests/factories.py

@@ -1,11 +0,0 @@
-import factory
-
-
-class UserFactory(factory.django.DjangoModelFactory):
-    username = factory.Sequence(lambda n: 'user-{0}'.format(n))
-    email = factory.Sequence(lambda n: 'user-{0}@example.com'.format(n))
-    password = factory.PostGenerationMethodCall('set_password', 'password')
-
-    class Meta:
-        model = 'users.User'
-        django_get_or_create = ('username', )

ccdb/users/tests/test_admin.py

@@ -1,39 +0,0 @@
-from test_plus.test import TestCase
-
-from ..admin import MyUserCreationForm
-
-
-class TestMyUserCreationForm(TestCase):
-    def setUp(self):
-        self.user = self.make_user()
-
-    def test_clean_username_success(self):
-        # Instantiate the form with a new username
-        form = MyUserCreationForm({
-            'username': 'alamode',
-            'password1': '123456',
-            'password2': '123456',
-        })
-        # Run is_valid() to trigger the validation
-        valid = form.is_valid()
-        self.assertTrue(valid)
-
-        # Run the actual clean_username method
-        username = form.clean_username()
-        self.assertEqual('alamode', username)
-
-    def test_clean_username_false(self):
-        # Instantiate the form with the same username as self.user
-        form = MyUserCreationForm({
-            'username': self.user.username,
-            'password1': '123456',
-            'password2': '123456',
-        })
-        # Run is_valid() to trigger the validation, which is going to fail
-        # because the username is already taken
-        valid = form.is_valid()
-        self.assertFalse(valid)
-
-        # The form.errors dict should contain a single error called 'username'
-        self.assertTrue(len(form.errors) == 1)
-        self.assertTrue('username' in form.errors)

ccdb/users/tests/test_models.py

@@ -1,18 +0,0 @@
-from test_plus.test import TestCase
-
-
-class TestUser(TestCase):
-    def setUp(self):
-        self.user = self.make_user()
-
-    def test__str__(self):
-        self.assertEqual(
-            self.user.__str__(),
-            "testuser"  # This is the default username for self.make_user()
-        )
-
-    def test_get_absolute_url(self):
-        self.assertEqual(
-            self.user.get_absolute_url(),
-            '/users/testuser/'
-        )

ccdb/users/tests/test_views.py

@@ -1,66 +0,0 @@
-from django.test import RequestFactory
-
-from test_plus.test import TestCase
-
-from ..views import (
-    UserRedirectView,
-    UserUpdateView
-)
-
-
-class BaseUserTestCase(TestCase):
-    def setUp(self):
-        self.user = self.make_user()
-        self.factory = RequestFactory()
-
-
-class TestUserRedirectView(BaseUserTestCase):
-    def test_get_redirect_url(self):
-        # Instantiate the view directly. Never do this outside a test!
-        view = UserRedirectView()
-        # Generate a fake request
-        request = self.factory.get('/fake-url')
-        # Attach the user to the request
-        request.user = self.user
-        # Attach the request to the view
-        view.request = request
-        # Expect: '/users/testuser/', as that is the default username for
-        #   self.make_user()
-        self.assertEqual(
-            view.get_redirect_url(),
-            '/users/testuser/'
-        )
-
-
-class TestUserUpdateView(BaseUserTestCase):
-    def setUp(self):
-        # call BaseUserTestCase.setUp()
-        super(TestUserUpdateView, self).setUp()
-        # Instantiate the view directly. Never do this outside a test!
-        self.view = UserUpdateView()
-        # Generate a fake request
-        request = self.factory.get('/fake-url')
-        # Attach the user to the request
-        request.user = self.user
-        # Attach the request to the view
-        self.view.request = request
-
-    def test_get_success_url(self):
-        # Expect: '/users/testuser/', as that is the default username for
-        #   self.make_user()
-        self.assertEqual(
-            self.view.get_success_url(),
-            '/users/testuser/'
-        )
-
-    # TODO: write this test
-    # def test_get_redirected(self):
-        # Expect '/users/testuser01/' to redirect, because that isn't the
-        #   currently logged in user
-
-    def test_get_object(self):
-        # Expect: self.user, as that is the request's user object
-        self.assertEqual(
-            self.view.get_object(),
-            self.user
-        )

ccdb/users/urls.py

@@ -1,14 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
-
-from django.conf.urls import url
-
-from . import views
-
-
-urlpatterns = [
-    url(regex=r'^$', view=views.UserListView.as_view(), name='list'),
-    url(regex=r'^redirect/$', view=views.UserRedirectView.as_view(), name='redirect'),
-    url(regex=r'^(?P<username>[\w.@+-]+)/$', view=views.UserDetailView.as_view(), name='detail'),
-    url(regex=r'^(?P<username>[\w.@+-]+)/update/$', view=views.UserUpdateView.as_view(), name='update'),
-]

ccdb/users/views.py

@@ -1,51 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
-
-from django.core.urlresolvers import reverse
-from django.views.generic import DetailView, ListView, RedirectView, UpdateView
-from django.shortcuts import redirect
-
-from braces.views import LoginRequiredMixin
-
-from .models import User
-
-
-class UserDetailView(LoginRequiredMixin, DetailView):
-    model = User
-    # These next two lines tell the view to index lookups by username
-    slug_field = "username"
-    slug_url_kwarg = "username"
-
-
-class UserRedirectView(LoginRequiredMixin, RedirectView):
-    permanent = False
-
-    def get_redirect_url(self):
-        return reverse("users:detail",
-                       kwargs={"username": self.request.user.username})
-
-
-class UserUpdateView(LoginRequiredMixin, UpdateView):
-    fields = ['name', 'timezone']
-    model = User
-
-    def dispatch(self, request, *args, **kwargs):
-        if request.user.username != kwargs.pop("username", None):
-            return redirect(reverse("users:detail",
-                                    kwargs={"username": request.user.username}))
-        return super(UserUpdateView, self).dispatch(request, *args, **kwargs)
-
-    def get_success_url(self):
-        return reverse("users:detail",
-                       kwargs={"username": self.request.user.username})
-
-    def get_object(self):
-        # Only get the User record for the user making the request
-        return User.objects.get(username=self.request.user.username)
-
-
-class UserListView(LoginRequiredMixin, ListView):
-    model = User
-    # These next two lines tell the view to index lookups by username
-    slug_field = "username"
-    slug_url_kwarg = "username"