move blocks module to wagtailcore

wagtail/wagtailcore/fields.py

@@ -8,7 +8,7 @@ from django.utils.six import with_metaclass
 
 from wagtail.wagtailcore.rich_text import DbWhitelister, expand_db_html
 from wagtail.utils.widgets import WidgetWithScript
-from wagtail.wagtailadmin.blocks import Block, StreamBlock, StreamValue, BlockField  # FIXME: wagtailcore shouldn't be depending on wagtailadmin
+from wagtail.wagtailcore.blocks import Block, StreamBlock, StreamValue, BlockField
 
 
 class RichTextArea(WidgetWithScript, forms.Textarea):

wagtail/wagtailcore/tests/test_blocks.py

@@ -4,7 +4,7 @@ from django import forms
 from django.forms.utils import ErrorList
 from django.core.exceptions import ValidationError
 
-from wagtail.wagtailadmin import blocks
+from wagtail.wagtailcore import blocks
 
 
 class TestFieldBlock(unittest.TestCase):

wagtail/wagtaildocs/blocks.py

@@ -3,7 +3,7 @@ from __future__ import unicode_literals
 from django.utils.functional import cached_property
 from django.utils.html import format_html
 
-from wagtail.wagtailadmin.blocks import ChooserBlock
+from wagtail.wagtailcore.blocks import ChooserBlock
 
 class DocumentChooserBlock(ChooserBlock):
     @cached_property

wagtail/wagtailembeds/blocks.py

@@ -1,4 +1,4 @@
-from wagtail.wagtailadmin import blocks
+from wagtail.wagtailcore import blocks
 
 from wagtail.wagtailembeds.format import embed_to_frontend_html
 

wagtail/wagtailimages/blocks.py

@@ -1,6 +1,6 @@
 from django.utils.functional import cached_property
 
-from wagtail.wagtailadmin.blocks import ChooserBlock
+from wagtail.wagtailcore.blocks import ChooserBlock
 
 class ImageChooserBlock(ChooserBlock):
     @cached_property

wagtail/wagtailsnippets/blocks.py

@@ -3,7 +3,7 @@ from __future__ import unicode_literals
 from django.utils.functional import cached_property
 from django.contrib.contenttypes.models import ContentType
 
-from wagtail.wagtailadmin.blocks import ChooserBlock
+from wagtail.wagtailcore.blocks import ChooserBlock
 
 class SnippetChooserBlock(ChooserBlock):
     def __init__(self, target_model, **kwargs):