Use original block order if selection is None

README.rst

@@ -47,7 +47,7 @@ This takes one argument, specifying the order in which to show the
 contained blocks.
 (Any non-block contents are ignored.)
 In this case this argument is given by the `article_order` parameter.
-When this is undefined, as it is here, the blocks are shown in their
+When this is undefined, as it is here, (or None) the blocks are shown in their
 original ordering.
 
 However there might also be some special kinds of articles, such as

lib/jinja2_orderblocks/orderblocks.py

@@ -67,12 +67,18 @@ def parse(self, parser):
 
                 block_names.append(node.name)
 
-        # Make a "For" node iterating over the given block selection.
-        # If the block selection is undefined then use the original ordering.
+        # Make a "For" node iterating over the given block selection.  If the
+        # block selection is undefined or None then use the original ordering.
         return nodes.For(
             block_name,
             nodes.CondExpr(
-                nodes.Test(block_selection, 'defined', [], [], None, None),
+                nodes.And(
+                    nodes.Test(block_selection, 'defined',
+                               [], [], None, None),
+                    nodes.Not(
+                        nodes.Test(block_selection, 'none',
+                                   [], [], None, None)),
+                ),
                 block_selection,
                 nodes.Tuple([nodes.Const(x) for x in block_names], 'store')),
             blocks, [], None, False)

test/test_orderblocks.py

@@ -35,6 +35,7 @@ def test_basic(self):
             'e')
 
         self.assertEqual(template.render(), 'abcde')
+        self.assertEqual(template.render(blocks=None), 'abcde')
         self.assertEqual(template.render(blocks=('x', 'y', 'z')), 'abcde')
         self.assertEqual(template.render(blocks=('z', 'y', 'x')), 'adcbe')
         self.assertEqual(template.render(blocks=('z', 'x', 'y')), 'adbce')