Hopiu/wagtail
1
0
Fork 0
mirror of https://github.com/Hopiu/wagtail.git synced 2026-05-12 17:23:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

make block names work properly when passed as binary strings

Browse source
This commit is contained in:
Matt Westcott 2015-02-16 12:17:56 +00:00
parent 64d5ffe2b2
commit 342fd7a061
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
wagtail/wagtailcore/blocks.py
View file

@ -115,7 +115,7 @@ class Block(six.with_metaclass(BaseBlock, object)):
def set_name(self, name):
self.name = name
if not self.meta.label:
self.label = capfirst(name.replace('_', ' '))
self.label = capfirst(force_text(name).replace('_', ' '))
@property
def media(self):

9
wagtail/wagtailcore/tests/test_blocks.py
View file

@ -408,6 +408,15 @@ class TestStreamBlock(unittest.TestCase):
self.assertEqual(list(block.child_blocks.keys()), ['heading', 'paragraph'])
def test_initialisation_with_binary_string_names(self):
# migrations will sometimes write out names as binary strings, just to keep us on our toes
block = blocks.StreamBlock([
(b'heading', blocks.CharBlock()),
(b'paragraph', blocks.CharBlock()),
])
self.assertEqual(list(block.child_blocks.keys()), [b'heading', b'paragraph'])
def test_initialisation_from_subclass(self):
class ArticleBlock(blocks.StreamBlock):
heading = blocks.CharBlock()