Skip to content

Commit

Permalink
Import re-ordering.
Browse files Browse the repository at this point in the history
  • Loading branch information
charettes committed Feb 22, 2015
1 parent e6ed7aa commit 9f37a78
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
1 change: 0 additions & 1 deletion dynamic_choices/compat.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import django


if django.VERSION >= (1, 6):
def get_model_name(opts):
return opts.model_name
Expand Down
1 change: 1 addition & 0 deletions tests/admin.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from django.contrib import admin

from dynamic_choices.admin import DynamicAdmin

from .forms import UserDefinedForm
Expand Down
13 changes: 7 additions & 6 deletions tests/tests.py
Original file line number Diff line number Diff line change
@@ -1,21 +1,22 @@
import json
import os

from django.core.exceptions import (FieldError, ImproperlyConfigured,
ValidationError)
from django.core.exceptions import (
FieldError, ImproperlyConfigured, ValidationError,
)
from django.db.models import Model
from django.test import TestCase
from django.test.client import Client

from dynamic_choices.admin import DynamicAdmin
from dynamic_choices.db.models import DynamicChoicesForeignKey
from dynamic_choices.forms import DynamicModelForm
from dynamic_choices.forms.fields import (DynamicModelMultipleChoiceField,
DynamicModelChoiceField)
from dynamic_choices.forms.fields import (
DynamicModelChoiceField, DynamicModelMultipleChoiceField,
)

from .admin import PuppetAdmin
from .models import Master, Puppet, ALIGNMENT_EVIL, ALIGNMENT_GOOD

from .models import ALIGNMENT_EVIL, ALIGNMENT_GOOD, Master, Puppet

MODULE_PATH = os.path.abspath(os.path.dirname(__file__))

Expand Down

0 comments on commit 9f37a78

Please sign in to comment.