From 948749dbdbc741a7ce2010b7ad9c8863aae8fdf4 Mon Sep 17 00:00:00 2001 From: Diederik van der Boor Date: Tue, 14 Oct 2014 17:30:25 +0200 Subject: [PATCH] Remove Django 1.7 warnings --- polymorphic/admin.py | 10 ++++++++-- polymorphic/tests.py | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/polymorphic/admin.py b/polymorphic/admin.py index 00c5d1d..c534297 100644 --- a/polymorphic/admin.py +++ b/polymorphic/admin.py @@ -277,8 +277,7 @@ class PolymorphicParentModelAdmin(admin.ModelAdmin): Expose the custom URLs for the subclasses and the URL resolver. """ urls = super(PolymorphicParentModelAdmin, self).get_urls() - meta = self.model._meta - info = meta.app_label, getattr(meta, 'model_name', meta.module_name) + info = _get_opt(self.model) # Patch the change URL so it's not a big catch-all; allowing all custom URLs to be added to the end. # The url needs to be recreated, patching url.regex is not an option Django 1.4's LocaleRegexProvider changed it. @@ -545,3 +544,10 @@ class PolymorphicChildModelAdmin(admin.ModelAdmin): except ValueError: pass # field not found in form, Django will raise exception later. return subclass_fields + + +def _get_opt(model): + try: + return model._meta.app_label, model._meta.model_name # Django 1.7 format + except AttributeError: + return model._meta.app_label, model._meta.module_name diff --git a/polymorphic/tests.py b/polymorphic/tests.py index 3974b4d..9f34c05 100644 --- a/polymorphic/tests.py +++ b/polymorphic/tests.py @@ -169,7 +169,7 @@ class PlainMyManagerQuerySet(QuerySet): class PlainMyManager(models.Manager): def my_queryset_foo(self): - return self.get_query_set().my_queryset_foo() + return self.get_queryset().my_queryset_foo() def get_queryset(self): return PlainMyManagerQuerySet(self.model, using=self._db)