From 352902556e42b417e42f459ca4bf759fc08e6615 Mon Sep 17 00:00:00 2001 From: Alex Marandon Date: Fri, 14 Nov 2014 15:14:55 +0100 Subject: [PATCH] Update deprecated imports with Django >= 1.7 --- modeltranslation/admin.py | 10 +++++++--- modeltranslation/models.py | 3 ++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/modeltranslation/admin.py b/modeltranslation/admin.py index b8467ce..d86e099 100644 --- a/modeltranslation/admin.py +++ b/modeltranslation/admin.py @@ -4,14 +4,18 @@ from copy import deepcopy import django from django.contrib import admin from django.contrib.admin.options import BaseModelAdmin, flatten_fieldsets, InlineModelAdmin -from django.contrib.contenttypes import generic from django import forms # Ensure that models are registered for translation before TranslationAdmin # runs. The import is supposed to resolve a race condition between model import # and translation registration in production (see issue #19). if django.VERSION < (1, 7): + from django.contrib.contenttypes.generic import GenericTabularInline + from django.contrib.contenttypes.generic import GenericStackedInline import modeltranslation.models # NOQA +else: + from django.contrib.contenttypes.admin import GenericTabularInline + from django.contrib.contenttypes.admin import GenericStackedInline from modeltranslation import settings as mt_settings from modeltranslation.translator import translator from modeltranslation.utils import ( @@ -334,11 +338,11 @@ class TranslationStackedInline(TranslationInlineModelAdmin, admin.StackedInline) pass -class TranslationGenericTabularInline(TranslationInlineModelAdmin, generic.GenericTabularInline): +class TranslationGenericTabularInline(TranslationInlineModelAdmin, GenericTabularInline): pass -class TranslationGenericStackedInline(TranslationInlineModelAdmin, generic.GenericStackedInline): +class TranslationGenericStackedInline(TranslationInlineModelAdmin, GenericStackedInline): pass diff --git a/modeltranslation/models.py b/modeltranslation/models.py index d544de6..a54c835 100644 --- a/modeltranslation/models.py +++ b/modeltranslation/models.py @@ -12,14 +12,15 @@ def autodiscover(): import sys import copy from django.conf import settings - from django.utils.importlib import import_module from django.utils.module_loading import module_has_submodule from modeltranslation.translator import translator from modeltranslation.settings import TRANSLATION_FILES, DEBUG if django.VERSION < (1, 7): + from django.utils.importlib import import_module mods = [(app, import_module(app)) for app in settings.INSTALLED_APPS] else: + from importlib import import_module from django.apps import apps mods = [(app_config.name, app_config.module) for app_config in apps.get_app_configs()]