From 9f96f676fda4817c62a6d5f29aff82c3665841e1 Mon Sep 17 00:00:00 2001 From: gordon Date: Sat, 6 Sep 2014 18:03:22 -0400 Subject: [PATCH] do not import south for dj17 --- wagtail/wagtailcore/fields.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/wagtail/wagtailcore/fields.py b/wagtail/wagtailcore/fields.py index 64235a4130..a1362b0743 100644 --- a/wagtail/wagtailcore/fields.py +++ b/wagtail/wagtailcore/fields.py @@ -1,6 +1,10 @@ +import django from django.db import models from django.forms import Textarea -from south.modelsinspector import add_introspection_rules + +if django.VERSION < (1, 7): + from south.modelsinspector import add_introspection_rules + add_introspection_rules([], ["^wagtail\.wagtailcore\.fields\.RichTextField"]) from wagtail.wagtailcore.rich_text import DbWhitelister, expand_db_html @@ -29,5 +33,3 @@ class RichTextField(models.TextField): defaults = {'widget': RichTextArea} defaults.update(kwargs) return super(RichTextField, self).formfield(**defaults) - -add_introspection_rules([], ["^wagtail\.wagtailcore\.fields\.RichTextField"])