Merge pull request #59 from akx/csty

PEP8, isort and cleanup

Author: akx

enumfields/admin.py

@@ -1,4 +1,5 @@
 from __future__ import print_function
+
 from django.contrib.admin.filters import ChoicesFieldListFilter
 from django.utils.encoding import force_text
 from django.utils.translation import ugettext_lazy as _

enumfields/compat.py

@@ -1,5 +1,5 @@
 # -- encoding: UTF-8 --
-from django.forms import TypedChoiceField, CharField
+from django.forms import CharField, TypedChoiceField
 from django.utils.text import capfirst
 
 __all__ = ["formfield"]
@@ -11,6 +11,7 @@
 # would make this compatible with our enums,
 # but it's best to go all the way to the freshest code, I think.
 
+
 def formfield(db_field, form_class=None, choices_form_class=None, **kwargs):
     """
     Returns a django.forms.Field instance for this database Field.
@@ -59,8 +60,8 @@ def formfield(db_field, form_class=None, choices_form_class=None, **kwargs):
         from django.utils.module_loading import import_by_path as import_string
 except ImportError:
     from django.utils.importlib import import_module
+
     def import_string(dotted_path):
         module_path, class_name = dotted_path.rsplit('.', 1)
         module = import_module(module_path)
         return getattr(module, class_name)
-

enumfields/enums.py

@@ -1,6 +1,9 @@
 import inspect
+from enum import Enum as BaseEnum
+from enum import EnumMeta as BaseEnumMeta
+from enum import _EnumDict
+
 from django.utils.encoding import python_2_unicode_compatible
-from enum import Enum as BaseEnum, EnumMeta as BaseEnumMeta, _EnumDict
 
 try:
     from django.utils.encoding import force_text

enumfields/fields.py

@@ -1,16 +1,18 @@
+from enum import Enum
+
 import django
+import six
 from django.core.exceptions import ValidationError
 from django.db import models
+from django.db.models.fields import BLANK_CHOICE_DASH, NOT_PROVIDED
 from django.utils.functional import cached_property
-from enum import Enum
-from .forms import EnumChoiceField
-import six
-from django.db.models.fields import NOT_PROVIDED, BLANK_CHOICE_DASH
 
 from .compat import import_string
+from .forms import EnumChoiceField
 
 metaclass = models.SubfieldBase if django.VERSION < (1, 8) else type
 
+
 class EnumFieldMixin(six.with_metaclass(metaclass)):
     def __init__(self, enum, **options):
         if isinstance(enum, six.string_types):
@@ -146,7 +148,6 @@ def enum_value(an_enum):
     raise ValueError("%s is not a enum" % an_enum)
 
 
-
 rules = [
     (
         [EnumFieldMixin],

enumfields/forms.py

@@ -5,6 +5,7 @@
 
 __all__ = ["EnumChoiceField", "EnumMultipleChoiceField"]
 
+
 class EnumChoiceFieldMixin(object):
     def prepare_value(self, value):
         # Widgets expect to get strings as values.
@@ -25,5 +26,6 @@ def valid_value(self, value):
 class EnumChoiceField(EnumChoiceFieldMixin, TypedChoiceField):
     pass
 
+
 class EnumMultipleChoiceField(EnumChoiceFieldMixin, TypedMultipleChoiceField):
     pass

setup.cfg

@@ -0,0 +1,28 @@
+[pep8]
+max-line-length = 120
+exclude = *migrations*
+ignore = E309
+
+[flake8]
+exclude = migrations
+max-line-length = 120
+max-complexity = 10
+
+[pytest]
+DJANGO_SETTINGS_MODULE = tests.settings
+norecursedirs = .git .tox .eggs .cache htmlcov venv*
+doctest_optionflags = NORMALIZE_WHITESPACE IGNORE_EXCEPTION_DETAIL ALLOW_UNICODE
+
+[isort]
+atomic=true
+combine_as_imports=false
+indent=4
+known_standard_library=token,tokenize,enum,importlib
+known_third_party=django,six
+length_sort=false
+line_length=120
+multi_line_output=5
+not_skip=__init__.py
+order_by_type=false
+skip=migrations
+wrap_length=120

tests/admin.py

@@ -4,6 +4,7 @@
 from django.contrib import admin
 
 from enumfields.admin import EnumFieldListFilter
+
 from .models import MyModel
 
 

tests/enums.py

@@ -1,5 +1,6 @@
 # coding=utf-8
 from __future__ import unicode_literals
+
 from django.utils.translation import ugettext_lazy
 
 from enumfields import Enum, IntEnum

tests/models.py

@@ -1,7 +1,8 @@
 from django.db import models
 
 from enumfields import EnumField, EnumIntegerField
-from .enums import Color, Taste, IntegerEnum, LabeledEnum, ZeroEnum
+
+from .enums import Color, IntegerEnum, LabeledEnum, Taste, ZeroEnum
 
 
 class MyModel(models.Model):

tests/settings.py

@@ -29,3 +29,22 @@
 DEBUG = True
 
 STATIC_URL = "/static/"
+
+TEMPLATES = [
+    {
+        'BACKEND': 'django.template.backends.django.DjangoTemplates',
+        'DIRS': [],
+        'APP_DIRS': True,
+        'OPTIONS': {
+            'context_processors': [
+                'django.contrib.auth.context_processors.auth',
+                'django.template.context_processors.debug',
+                'django.template.context_processors.i18n',
+                'django.template.context_processors.media',
+                'django.template.context_processors.static',
+                'django.template.context_processors.tz',
+                'django.contrib.messages.context_processors.messages',
+            ],
+        },
+    },
+]

tests/test_django_admin.py

@@ -2,48 +2,18 @@
 import re
 import uuid
 
-try:
-    from django.contrib.auth import get_user_model
-except ImportError:  # `get_user_model` only exists from Django 1.5 on.
-    from django.contrib.auth.models import User
-
-    get_user_model = lambda: User
-
-from django.core.urlresolvers import reverse
-from django.test import Client
 import pytest
-from enumfields import EnumIntegerField
-from .enums import Color, Taste, ZeroEnum, IntegerEnum
-from .models import MyModel
-
-
-@pytest.fixture
-def client():
-    return Client()
-
-
-SUPERUSER_USERNAME = "superuser"
-SUPERUSER_PASS = "superpass"
-
-
-@pytest.fixture
-def superuser():
-    return get_user_model().objects.create_superuser(
-        username=SUPERUSER_USERNAME,
-        password=SUPERUSER_PASS,
-        email="[email protected]"
-    )
+from django.core.urlresolvers import reverse
 
+from enumfields import EnumIntegerField
 
-@pytest.fixture
-def superuser_client(client, superuser):
-    client.login(username=SUPERUSER_USERNAME, password=SUPERUSER_PASS)
-    return client
+from .enums import Color, IntegerEnum, Taste, ZeroEnum
+from .models import MyModel
 
 
 @pytest.mark.django_db
 @pytest.mark.urls('tests.urls')
-def test_model_admin_post(superuser_client):
+def test_model_admin_post(admin_client):
     url = reverse("admin:tests_mymodel_add")
     secret_uuid = str(uuid.uuid4())
     post_data = {
@@ -53,7 +23,7 @@ def test_model_admin_post(superuser_client):
         'random_code': secret_uuid,
         'zero2': ZeroEnum.ZERO.value,
     }
-    response = superuser_client.post(url, follow=True, data=post_data)
+    response = admin_client.post(url, follow=True, data=post_data)
     response.render()
     text = response.content
 
@@ -73,7 +43,7 @@ def test_model_admin_post(superuser_client):
 @pytest.mark.parametrize('q_color', (None, Color.BLUE, Color.RED))
 @pytest.mark.parametrize('q_taste', (None, Taste.SWEET, Taste.SOUR))
 @pytest.mark.parametrize('q_int_enum', (None, IntegerEnum.A, IntegerEnum.B))
-def test_model_admin_filter(superuser_client, q_color, q_taste, q_int_enum):
+def test_model_admin_filter(admin_client, q_color, q_taste, q_int_enum):
     """
     Test that various combinations of Enum filters seem to do the right thing in the change list.
     """
@@ -94,7 +64,7 @@ def test_model_admin_filter(superuser_client, q_color, q_taste, q_int_enum):
     # Build the query string (this is assuming things, sort of)
     qs = dict(('%s__exact' % k, v.value) for (k, v) in lookup.items())
     # Run the request!
-    response = superuser_client.get(reverse('admin:tests_mymodel_changelist'), data=qs)
+    response = admin_client.get(reverse('admin:tests_mymodel_changelist'), data=qs)
     response.render()
 
     # Look for the paginator line that lists how many results we found...

tests/test_django_models.py

@@ -1,8 +1,9 @@
 # -- encoding: UTF-8 --
 
+from enum import IntEnum
+
 import pytest
 from django.db import connection
-from enum import IntEnum
 
 from .enums import Color, IntegerEnum, LabeledEnum, Taste, ZeroEnum
 from .models import MyModel

tests/test_enums.py

@@ -1,14 +1,16 @@
 # -- encoding: UTF-8 --
 from __future__ import unicode_literals
-from django.core.exceptions import ValidationError
 
-from django.forms import BaseForm
-from enumfields import EnumField
 import pytest
 import six
+from django.core.exceptions import ValidationError
+from django.forms import BaseForm
+
+from enumfields import EnumField
 
 from .enums import Color, IntegerEnum
 
+
 def test_choice_ordering():
     EXPECTED_CHOICES = (
         ('r', 'Reddish'),
@@ -19,23 +21,27 @@ def test_choice_ordering():
         assert key == ex_key
         assert six.text_type(val) == six.text_type(ex_val)
 
+
 def test_custom_labels():
     # Custom label
     assert Color.RED.label == 'Reddish'
     assert six.text_type(Color.RED) == 'Reddish'
     assert six.text_type(IntegerEnum.A) == 'foo'
 
+
 def test_automatic_labels():
     # Automatic label
     assert Color.GREEN.label == 'Green'
     assert six.text_type(Color.GREEN) == 'Green'
     assert six.text_type(IntegerEnum.B) == 'B'
 
+
 def test_lazy_labels():
     # Lazy label
     assert isinstance(six.text_type(Color.BLUE), six.string_types)
     assert six.text_type(Color.BLUE) == 'bluë'
 
+
 def test_formfield_labels():
     # Formfield choice label
     form_field = EnumField(Color).formfield()
@@ -44,6 +50,7 @@ def test_formfield_labels():
         if value:
             assert text == expectations[value]
 
+
 def test_formfield_functionality():
     form_cls = type(str("FauxForm"), (BaseForm,), {
         "base_fields": {"color": EnumField(Color).formfield()}
@@ -52,10 +59,12 @@ def test_formfield_functionality():
     assert not form.errors
     assert form.cleaned_data["color"] == Color.RED
 
+
 def test_invalid_to_python_fails():
     with pytest.raises(ValidationError) as ve:
         EnumField(Color).to_python("invalid")
     assert ve.value.code == "invalid_enum_value"
 
+
 def test_import_by_string():
     assert EnumField("tests.test_enums.Color").enum == Color

tests/test_form_fields.py

@@ -1,10 +1,11 @@
 # -- encoding: UTF-8 --
+import pytest
+import six
 from django.db.models import BLANK_CHOICE_DASH
 from django.forms.models import modelform_factory
-import pytest
+
 from .enums import Color
 from .models import MyModel
-import six
 
 
 def get_form(**kwargs):

tests/urls.py

@@ -1,19 +1,14 @@
 # -*- coding: utf-8 -*-
 from django.conf import settings
-from django.contrib.staticfiles.urls import staticfiles_urlpatterns
-
-__author__ = 'mikhailturilin'
-
-from django.conf.urls import *
+from django.conf.urls import include, url
 from django.contrib import admin
-
+from django.contrib.staticfiles.urls import staticfiles_urlpatterns
 
 admin.autodiscover()
 
-urlpatterns = patterns(
-    '',
+urlpatterns = [
     url(r'^admin/', include(admin.site.urls)),
-)
+]
 
 if settings.DEBUG:
-    urlpatterns = staticfiles_urlpatterns() + urlpatterns
+    urlpatterns = staticfiles_urlpatterns() + urlpatterns