diff --git a/admin_interface/admin.py b/admin_interface/admin.py index 085e91a..73f1472 100644 --- a/admin_interface/admin.py +++ b/admin_interface/admin.py @@ -1,13 +1,9 @@ # -*- coding: utf-8 -*- +from admin_interface.compat import gettext_lazy as _ from admin_interface.models import Theme -import django from django.contrib import admin -if django.VERSION < (2, 0): - from django.utils.translation import ugettext_lazy as _ -else: - from django.utils.translation import gettext_lazy as _ class ThemeAdmin(admin.ModelAdmin): diff --git a/admin_interface/apps.py b/admin_interface/apps.py index 359de8b..d15cb76 100644 --- a/admin_interface/apps.py +++ b/admin_interface/apps.py @@ -1,12 +1,9 @@ # -*- coding: utf-8 -*- -import django +from admin_interface.compat import gettext_lazy as _ + from django.apps import AppConfig from django.db.models.signals import post_migrate -if django.VERSION < (2, 0): - from django.utils.translation import ugettext_lazy as _ -else: - from django.utils.translation import gettext_lazy as _ class AdminInterfaceConfig(AppConfig): diff --git a/admin_interface/compat.py b/admin_interface/compat.py new file mode 100644 index 0000000..bfb0680 --- /dev/null +++ b/admin_interface/compat.py @@ -0,0 +1,15 @@ +# -*- coding: utf-8 -*- + +import django + +if django.VERSION < (2, 0): + from django.utils.encoding import force_text as force_str + from django.utils.translation import ugettext_lazy as gettext_lazy +else: + from django.utils.encoding import force_str + from django.utils.translation import gettext_lazy + +if django.VERSION >= (1, 11): + from django.core.validators import FileExtensionValidator +else: + FileExtensionValidator = lambda allowed_extensions: None diff --git a/admin_interface/models.py b/admin_interface/models.py index 2288c95..c2358c6 100644 --- a/admin_interface/models.py +++ b/admin_interface/models.py @@ -3,23 +3,12 @@ from __future__ import unicode_literals from admin_interface.cache import del_cached_active_theme +from admin_interface.compat import FileExtensionValidator, force_str, gettext_lazy as _ from colorfield.fields import ColorField -import django -if django.VERSION >= (1, 11): - from django.core.validators import FileExtensionValidator -else: - FileExtensionValidator = lambda allowed_extensions: None - from django.db import models from django.db.models.signals import post_delete, post_save, pre_save -if django.VERSION < (2, 0): - from django.utils.encoding import force_text as force_str - from django.utils.translation import ugettext_lazy as _ -else: - from django.utils.encoding import force_str - from django.utils.translation import gettext_lazy as _ from six import python_2_unicode_compatible