From 6ab58e3605834e1372ebc4e7f690946d070e7f91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anssi=20K=C3=A4=C3=A4ri=C3=A4inen?= Date: Mon, 20 Jan 2014 13:11:27 +0200 Subject: [PATCH] Fixed a couple of deprecation warnings --- django/contrib/admin/checks.py | 2 +- django/contrib/contenttypes/checks.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/django/contrib/admin/checks.py b/django/contrib/admin/checks.py index 9a39d9a901..515cedcf69 100644 --- a/django/contrib/admin/checks.py +++ b/django/contrib/admin/checks.py @@ -3,7 +3,7 @@ from __future__ import unicode_literals from itertools import chain -from django.contrib.admin.util import get_fields_from_path, NotRelationField +from django.contrib.admin.utils import get_fields_from_path, NotRelationField from django.core import checks from django.db import models from django.db.models.fields import FieldDoesNotExist diff --git a/django/contrib/contenttypes/checks.py b/django/contrib/contenttypes/checks.py index 7b4ab81962..dcd3a58b9f 100644 --- a/django/contrib/contenttypes/checks.py +++ b/django/contrib/contenttypes/checks.py @@ -2,15 +2,15 @@ from __future__ import unicode_literals from django.utils import six +from django.apps import apps def check_generic_foreign_keys(**kwargs): from .generic import GenericForeignKey - from django.db import models errors = [] fields = (obj - for cls in models.get_models() + for cls in apps.get_models() for obj in six.itervalues(vars(cls)) if isinstance(obj, GenericForeignKey)) for field in fields: