Flake, autoflake and various cleanups for tests file

Author: agateblue

docs/conf.py

@@ -50,8 +50,8 @@
 master_doc = "index"
 
 # General information about the project.
-project = u"django-dynamic-preferences"
-copyright = u"2014, Agate Blue"
+project = "django-dynamic-preferences"
+copyright = "2014, Agate Blue"
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -197,8 +197,8 @@
     (
         "index",
         "django-dynamic-preferences.tex",
-        u"django-dynamic-preferences Documentation",
-        u"Agate Blue",
+        "django-dynamic-preferences Documentation",
+        "Agate Blue",
         "manual",
     ),
 ]
@@ -232,8 +232,8 @@
     (
         "index",
         "django-dynamic-preferences",
-        u"django-dynamic-preferences Documentation",
-        [u"Agate Blue"],
+        "django-dynamic-preferences Documentation",
+        ["Agate Blue"],
         1,
     )
 ]
@@ -251,8 +251,8 @@
     (
         "index",
         "django-dynamic-preferences",
-        u"django-dynamic-preferences Documentation",
-        u"Agate Blue",
+        "django-dynamic-preferences Documentation",
+        "Agate Blue",
         "django-dynamic-preferences",
         "One line description of project.",
         "Miscellaneous",

setup.cfg

@@ -1,2 +1,5 @@
 [wheel]
 universal = 1
+
+[flake8]
+max-line-length = 90

tests/test_app/dynamic_preferences_registry.py

@@ -1,6 +1,7 @@
-from datetime import timezone
+import datetime
+
 from decimal import Decimal
-from dynamic_preferences.types import *
+from dynamic_preferences import types
 from dynamic_preferences.registries import global_preferences_registry
 from dynamic_preferences.users.registries import user_preferences_registry
 from dynamic_preferences.preferences import Section
@@ -10,7 +11,7 @@
 
 # Tutorial preferences
 @global_preferences_registry.register
-class RegistrationAllowed(BooleanPreference):
+class RegistrationAllowed(types.BooleanPreference):
     """
     Are new registrations allowed ?
     """
@@ -21,7 +22,7 @@ class RegistrationAllowed(BooleanPreference):
 
 
 @global_preferences_registry.register
-class MaxUsers(IntPreference):
+class MaxUsers(types.IntPreference):
     """
     Are new registrations allowed ?
     """
@@ -39,26 +40,26 @@ def validate(self, value):
         return value
 
 
-class NoDefault(IntPreference):
+class NoDefault(types.IntPreference):
     section = "user"
     name = "no_default"
 
 
-class NoModel(ModelChoicePreference):
+class NoModel(types.ModelChoicePreference):
     section = "blog"
     name = "no_model"
     default = None
 
 
 @global_preferences_registry.register
-class ItemsPerPage(IntPreference):
+class ItemsPerPage(types.IntPreference):
     section = "user"
     name = "items_per_page"
     default = 25
 
 
 @global_preferences_registry.register
-class FeaturedBlogEntry(ModelChoicePreference):
+class FeaturedBlogEntry(types.ModelChoicePreference):
     section = "blog"
     name = "featured_entry"
     queryset = BlogEntry.objects.all()
@@ -68,26 +69,26 @@ def get_default(self):
 
 
 @global_preferences_registry.register
-class BlogLogo(FilePreference):
+class BlogLogo(types.FilePreference):
     section = "blog"
     name = "logo"
 
 
 @global_preferences_registry.register
-class BlogLogo2(FilePreference):
+class BlogLogo2(types.FilePreference):
     section = "blog"
     name = "logo2"
 
 
 @global_preferences_registry.register
-class BlogCost(DecimalPreference):
+class BlogCost(types.DecimalPreference):
     section = "type"
     name = "cost"
     default = Decimal(0)
 
 
 @user_preferences_registry.register
-class FavoriteVegetable(ChoicePreference):
+class FavoriteVegetable(types.ChoicePreference):
     choices = (
         ("C", "Carrot"),
         ("T", "Tomato. I know, it's not a vegetable"),
@@ -99,7 +100,7 @@ class FavoriteVegetable(ChoicePreference):
 
 
 @user_preferences_registry.register
-class FavoriteVegetables(MultipleChoicePreference):
+class FavoriteVegetables(types.MultipleChoicePreference):
     choices = (
         ("C", "Carrot"),
         ("T", "Tomato. I know, it's not a vegetable"),
@@ -111,7 +112,7 @@ class FavoriteVegetables(MultipleChoicePreference):
 
 
 @user_preferences_registry.register
-class FavouriteColour(StringPreference):
+class FavouriteColour(types.StringPreference):
     """
     What's your favourite colour ?
     """
@@ -122,7 +123,7 @@ class FavouriteColour(StringPreference):
 
 
 @user_preferences_registry.register
-class IsZombie(BooleanPreference):
+class IsZombie(types.BooleanPreference):
     """
     Are you a zombie ?
     """
@@ -138,78 +139,78 @@ class BaseTestPref(object):
 
 # No section pref
 @global_preferences_registry.register
-class NoSection(BooleanPreference):
+class NoSection(types.BooleanPreference):
     name = "no_section"
     default = False
 
 
 # User preferences
 @user_preferences_registry.register
-class TestUserPref1(BaseTestPref, StringPreference):
+class TestUserPref1(BaseTestPref, types.StringPreference):
     name = "TestUserPref1"
     default = "default value"
 
 
 @user_preferences_registry.register
-class TestUserPref2(BaseTestPref, StringPreference):
+class TestUserPref2(BaseTestPref, types.StringPreference):
     name = "TestUserPref2"
     default = "default value"
 
 
 @user_preferences_registry.register
-class UserBooleanPref(BaseTestPref, BooleanPreference):
+class UserBooleanPref(BaseTestPref, types.BooleanPreference):
     name = "SiteBooleanPref"
     default = False
 
 
 @user_preferences_registry.register
-class UserStringPref(BaseTestPref, StringPreference):
+class UserStringPref(BaseTestPref, types.StringPreference):
     name = "SUserStringPref"
     default = "Hello world!"
 
 
 # Global
 @global_preferences_registry.register
-class TestGlobal1(BaseTestPref, StringPreference):
+class TestGlobal1(BaseTestPref, types.StringPreference):
     name = "TestGlobal1"
     default = "default value"
 
 
 @global_preferences_registry.register
-class TestGlobal2(BaseTestPref, BooleanPreference):
+class TestGlobal2(BaseTestPref, types.BooleanPreference):
     name = "TestGlobal2"
     default = False
 
 
 @global_preferences_registry.register
-class TestGlobal3(BaseTestPref, BooleanPreference):
+class TestGlobal3(BaseTestPref, types.BooleanPreference):
     name = "TestGlobal3"
     default = False
 
 
 @global_preferences_registry.register
-class ExamDuration(DurationPreference):
+class ExamDuration(types.DurationPreference):
     section = "exam"
     name = "duration"
-    default = timedelta(hours=3)
+    default = datetime.timedelta(hours=3)
 
 
 @global_preferences_registry.register
-class RegistrationDate(DatePreference):
+class RegistrationDate(types.DatePreference):
     section = "company"
     name = "RegistrationDate"
-    default = date(1998, 9, 4)
+    default = datetime.date(1998, 9, 4)
 
 
 @global_preferences_registry.register
-class BirthDateTime(DateTimePreference):
+class BirthDateTime(types.DateTimePreference):
     section = Section("child", verbose_name="Child Section Verbose Name")
     name = "BirthDateTime"
-    default = datetime(1992, 5, 4, 3, 4, 10, 150, tzinfo=timezone.utc)
+    default = datetime.datetime(1992, 5, 4, 3, 4, 10, 150, tzinfo=datetime.timezone.utc)
 
 
 @global_preferences_registry.register
-class OpenningTime(TimePreference):
+class OpenningTime(types.TimePreference):
     section = "company"
     name = "OpenningTime"
-    default = time(hour=8, minute=0)
+    default = datetime.time(hour=8, minute=0)

tests/test_checkpreferences_command.py

@@ -1,8 +1,6 @@
 from io import StringIO
 
-from django.core.cache import caches
 from django.core.management import call_command
-from django.test import TestCase
 
 
 def call(*args, **kwargs):

tests/test_global_preferences.py

@@ -1,19 +1,10 @@
-from __future__ import unicode_literals
-
-import pytest
-
-
 from datetime import timezone
 from decimal import Decimal
 
 from datetime import date, timedelta, datetime, time
 from django.apps import apps
-from django.test import LiveServerTestCase, TestCase
-from django.test.utils import override_settings
 from django.urls import reverse
 from django.core.management import call_command
-from django.core.cache import caches
-from django.contrib.auth.models import User
 from django.core.files.uploadedfile import SimpleUploadedFile
 from django.utils.timezone import make_aware
 
@@ -164,7 +155,7 @@ def test_preference_are_updated_on_form_submission(admin_client):
         "exam__duration": timedelta(hours=5),
         "company__OpenningTime": time(hour=8, minute=0),
     }
-    response = admin_client.post(url, data)
+    admin_client.post(url, data)
     for key, expected_value in data.items():
         try:
             section, name = key.split("__")
@@ -189,7 +180,9 @@ def test_preference_are_updated_on_form_submission_by_section(admin_client):
             "user__registration_allowed": True,
             "user__items_per_page": 12,
         },
+        follow=True,
     )
+    assert response.status_code == 200
     assert (
         GlobalPreferenceModel.objects.get(section="user", name="max_users").value == 95
     )
@@ -218,8 +211,9 @@ def test_file_preference(admin_client):
     logo = SimpleUploadedFile("logo.png", content, content_type="image/png")
     url = reverse("dynamic_preferences:global.section", kwargs={"section": "blog"})
     response = admin_client.post(
-        url, {"blog__featured_entry": blog_entry.pk, "blog__logo": logo}
+        url, {"blog__featured_entry": blog_entry.pk, "blog__logo": logo}, follow=True
     )
+    assert response.status_code == 200
     assert (
         GlobalPreferenceModel.objects.get(section="blog", name="featured_entry").value
         == blog_entry

tests/test_manager.py

@@ -1,8 +1,4 @@
-from __future__ import unicode_literals
-from django.test import TestCase
-from django.core.cache import caches
 from django.urls import reverse
-from django.contrib.auth.models import User
 
 from dynamic_preferences.registries import global_preferences_registry as registry
 from dynamic_preferences.models import GlobalPreferenceModel
@@ -72,7 +68,9 @@ def test_invalidates_cache_when_saving_from_admin(admin_client):
     assert manager.cache.get(key) == "reset1"
     assert manager.all()["test__TestGlobal1"] == "reset1"
 
-    response = admin_client.post(url, {"raw_value": "reset2"})
+    response = admin_client.post(url, {"raw_value": "reset2"}, follow=True)
+
+    assert response.status_code == 200
 
     assert manager.cache.get(key) == "reset2"
     assert manager.all()["test__TestGlobal1"] == "reset2"

tests/test_preferences.py

@@ -1,9 +1,3 @@
-from __future__ import unicode_literals
-from django.test import TestCase
-from django.test.utils import override_settings
-from django.contrib.auth.models import User
-from django.core.cache import caches
-
 import pytest
 
 from dynamic_preferences.registries import (
@@ -75,11 +69,11 @@ def test_preferences_manager_set(db):
 def test_can_cache_single_preference(db, django_assert_num_queries):
 
     manager = global_preferences_registry.manager()
-    v = manager["no_section"]
+    manager["no_section"]
     with django_assert_num_queries(0):
-        v = manager["no_section"]
-        v = manager["no_section"]
-        v = manager["no_section"]
+        manager["no_section"]
+        manager["no_section"]
+        manager["no_section"]
 
 
 def test_can_bypass_cache_in_get(db, settings, django_assert_num_queries):
@@ -108,7 +102,7 @@ def test_can_bypass_cache_in_get_all(db, settings):
 
 
 def test_can_cache_all_preferences(db, django_assert_num_queries):
-    blog_entry = BlogEntry.objects.create(title="test", content="test")
+    BlogEntry.objects.create(title="test", content="test")
     manager = global_preferences_registry.manager()
     manager.all()
     with django_assert_num_queries(3):
@@ -175,12 +169,12 @@ def test_can_get_to_string_notation(db):
 
 def test_preference_requires_default_value():
     with pytest.raises(exceptions.MissingDefault):
-        preference = prefs.NoDefault()
+        prefs.NoDefault()
 
 
 def test_modelchoicepreference_requires_model_value():
     with pytest.raises(exceptions.MissingModel):
-        preference = prefs.NoModel()
+        prefs.NoModel()
 
 
 def test_get_field_uses_field_kwargs():