Merge pull request #1474 from kaedroho/modelcluster-update

Fixed imports for moved modelcluster.tags module

docs/reference/pages/model_recipes.rst

@@ -154,7 +154,7 @@ Using an example from the Wagtail demo site, here's what the tag model and the r
 .. code-block:: python
 
     from modelcluster.fields import ParentalKey
-    from modelcluster.tags import ClusterTaggableManager
+    from modelcluster.contrib.taggit import ClusterTaggableManager
     from taggit.models import Tag, TaggedItemBase
     ...
     class BlogPageTag(TaggedItemBase):

wagtail/tests/demosite/migrations/0001_initial.py

@@ -4,7 +4,7 @@ from __future__ import unicode_literals
 from django.db import models, migrations
 import django.db.models.deletion
 import django
-import modelcluster.tags
+import modelcluster.contrib.taggit
 import wagtail.wagtailcore.fields
 import modelcluster.fields
 
@@ -508,7 +508,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='blogentrypage',
             name='tags',
-            field=modelcluster.tags.ClusterTaggableManager(help_text='A comma-separated list of tags.', through='demosite.BlogEntryPageTag', blank=True, verbose_name='Tags', to='taggit.Tag'),
+            field=modelcluster.contrib.taggit.ClusterTaggableManager(help_text='A comma-separated list of tags.', through='demosite.BlogEntryPageTag', blank=True, verbose_name='Tags', to='taggit.Tag'),
             preserve_default=True,
         ),
     ]

wagtail/tests/demosite/models.py

@@ -4,7 +4,7 @@ from django.db import models
 from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
 
 from modelcluster.fields import ParentalKey
-from modelcluster.tags import ClusterTaggableManager
+from modelcluster.contrib.taggit import ClusterTaggableManager
 from taggit.models import TaggedItemBase
 
 from wagtail.wagtailcore.models import Page, Orderable

wagtail/tests/testapp/migrations/0001_initial.py

@@ -4,7 +4,7 @@ from __future__ import unicode_literals
 from django.db import models, migrations
 import django.db.models.deletion
 from django.conf import settings
-import modelcluster.tags
+import modelcluster.contrib.taggit
 import wagtail.wagtailimages.models
 import wagtail.wagtailadmin.taggable
 import modelcluster.fields
@@ -328,7 +328,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='taggedpage',
             name='tags',
-            field=modelcluster.tags.ClusterTaggableManager(verbose_name='Tags', to='taggit.Tag', blank=True, through='tests.TaggedPageTag', help_text='A comma-separated list of tags.'),
+            field=modelcluster.contrib.taggit.ClusterTaggableManager(verbose_name='Tags', to='taggit.Tag', blank=True, through='tests.TaggedPageTag', help_text='A comma-separated list of tags.'),
             preserve_default=True,
         ),
         migrations.AddField(

wagtail/tests/testapp/models.py

@@ -7,7 +7,7 @@ from django.utils.encoding import python_2_unicode_compatible
 from taggit.models import TaggedItemBase
 
 from modelcluster.fields import ParentalKey
-from modelcluster.tags import ClusterTaggableManager
+from modelcluster.contrib.taggit import ClusterTaggableManager
 
 from wagtail.wagtailcore.models import Page, Orderable
 from wagtail.wagtailcore.fields import RichTextField, StreamField