Remove fallback code for old Wagtail versions from wagtail_factories

wagtail/test/utils/wagtail_factories/__init__.py

@@ -1,4 +1,2 @@
 from .blocks import *  # noqa
 from .factories import *  # noqa
-
-__version__ = "4.0.0"

wagtail/test/utils/wagtail_factories/blocks.py

@@ -3,15 +3,10 @@ from collections import defaultdict
 import factory
 from factory.declarations import ParameteredAttribute
 
-from wagtail import VERSION as wagtail_version
+from wagtail import blocks
 from wagtail.documents.blocks import DocumentChooserBlock
 from wagtail.images.blocks import ImageChooserBlock
 
-if wagtail_version >= (3, 0):
-    from wagtail import blocks
-else:
-    from wagtail.core import blocks
-
 from .builder import (
     ListBlockStepBuilder,
     StreamBlockStepBuilder,
@@ -138,11 +133,8 @@ class ListBlockFactory(factory.SubFactory):
             for _, params in sorted(result.items())
         ]
 
-        if wagtail_version >= (2, 16):
-            list_block_def = blocks.list_block.ListBlock(subfactory._meta.model())
-            return blocks.list_block.ListValue(list_block_def, values)
-        else:
-            return values
+        list_block_def = blocks.list_block.ListBlock(subfactory._meta.model())
+        return blocks.list_block.ListValue(list_block_def, values)
 
 
 class StructBlockFactory(factory.Factory):

wagtail/test/utils/wagtail_factories/builder.py

@@ -3,11 +3,7 @@ from itertools import zip_longest
 from factory import SubFactory
 from factory.builder import StepBuilder
 
-try:
-    from wagtail import blocks
-except ImportError:
-    # Wagtail<3.0
-    from wagtail.core import blocks
+from wagtail import blocks
 
 
 class StreamFieldFactoryException(Exception):

wagtail/test/utils/wagtail_factories/factories.py

@@ -4,18 +4,11 @@ import factory
 from django.utils.text import slugify
 from factory import errors, utils
 from factory.declarations import ParameteredAttribute
-
-from wagtail.images import get_image_model
-
-try:
-    from wagtail.models import Collection, Page, Site
-except ImportError:
-    # Wagtail<3.0
-    from wagtail.core.models import Collection, Page, Site
-
 from factory.django import DjangoModelFactory
 
 from wagtail.documents import get_document_model
+from wagtail.images import get_image_model
+from wagtail.models import Collection, Page, Site
 
 __all__ = [
     "CollectionFactory",