Merge pull request #1 from overcastsoftware/wt4

backwards compatible fix for wagtailtables

Author: saevarom

wagtailtables/blocks.py

@@ -2,11 +2,19 @@
 from django import forms
 from django.conf import settings
 from django.utils.functional import cached_property
-from wagtail.core.blocks import (BooleanBlock, CharBlock, ChoiceBlock,
-                                 StructBlock, TextBlock)
-from wagtail.core.blocks.struct_block import StructBlockAdapter
+
 from wagtail.core.telepath import register
+from wagtail import VERSION
 
+# Backwards compatibility
+if VERSION[0] < 3:
+    from wagtail.core.blocks.struct_block import StructBlockAdapter
+    from wagtail.core.blocks import (BooleanBlock, CharBlock, ChoiceBlock,
+                                 StructBlock, TextBlock)
+else:
+    from wagtail.blocks.struct_block import StructBlockAdapter
+    from wagtail.blocks import (BooleanBlock, CharBlock, ChoiceBlock,
+                                 StructBlock, TextBlock)
 
 def get_choices():
     default_choices = (
@@ -36,8 +44,6 @@ class Meta:
         label = 'Table Block'
         template = 'wagtailtables/table_block.html'
 
-        
-
 
 class TableAdapter(StructBlockAdapter):
     js_constructor = 'streams.blocks.TableBlock'