From 162f430b352323639f624aae2dc3513e0a7970b1 Mon Sep 17 00:00:00 2001 From: Matt Westcott Date: Thu, 19 Feb 2015 19:22:35 +0000 Subject: [PATCH] rename the 'field' and 'stream' submodules to 'field_block' and 'stream_block'. We can't use the name 'list' as a submodule, so we might as well make the others consistent. --- wagtail/wagtailcore/blocks/__init__.py | 4 ++-- wagtail/wagtailcore/blocks/{field.py => field_block.py} | 0 wagtail/wagtailcore/blocks/{stream.py => stream_block.py} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename wagtail/wagtailcore/blocks/{field.py => field_block.py} (100%) rename wagtail/wagtailcore/blocks/{stream.py => stream_block.py} (100%) diff --git a/wagtail/wagtailcore/blocks/__init__.py b/wagtail/wagtailcore/blocks/__init__.py index f58951961..47862b546 100644 --- a/wagtail/wagtailcore/blocks/__init__.py +++ b/wagtail/wagtailcore/blocks/__init__.py @@ -558,6 +558,6 @@ class BlockField(forms.Field): # Import block types defined in submodules into the wagtail.wagtailcore.blocks namespace -from .field import * # NOQA +from .field_block import * # NOQA from .list_block import * # NOQA -from .stream import * # NOQA +from .stream_block import * # NOQA diff --git a/wagtail/wagtailcore/blocks/field.py b/wagtail/wagtailcore/blocks/field_block.py similarity index 100% rename from wagtail/wagtailcore/blocks/field.py rename to wagtail/wagtailcore/blocks/field_block.py diff --git a/wagtail/wagtailcore/blocks/stream.py b/wagtail/wagtailcore/blocks/stream_block.py similarity index 100% rename from wagtail/wagtailcore/blocks/stream.py rename to wagtail/wagtailcore/blocks/stream_block.py