From 285eed9a3d7b3d306b8c2f2264cfc9be96462089 Mon Sep 17 00:00:00 2001 From: goodger Date: Wed, 10 Aug 2005 02:49:06 +0000 Subject: [PATCH] fixed enumerated list bug (SF#1254145) git-svn-id: https://docutils.svn.sourceforge.net/svnroot/docutils/trunk@3789 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 --- docutils/docutils/parsers/rst/states.py | 17 +++++++++-------- .../test/test_parsers/test_rst/test_enumerated_lists.py | 10 ++++++++++ 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/docutils/docutils/parsers/rst/states.py b/docutils/docutils/parsers/rst/states.py index 4156fd682..175334fd2 100644 --- a/docutils/docutils/parsers/rst/states.py +++ b/docutils/docutils/parsers/rst/states.py @@ -1289,14 +1289,15 @@ class Body(RSTState): self.state_machine.previous_line() if not next_line[:1].strip(): # blank or indented return 1 - next_enumerator, auto_enumerator = self.make_enumerator( - ordinal + 1, sequence, format) - try: - if ( next_line.startswith(next_enumerator) or - next_line.startswith(auto_enumerator) ): - return 1 - except TypeError: - pass + result = self.make_enumerator(ordinal + 1, sequence, format) + if result: + next_enumerator, auto_enumerator = result + try: + if ( next_line.startswith(next_enumerator) or + next_line.startswith(auto_enumerator) ): + return 1 + except TypeError: + pass return None def make_enumerator(self, ordinal, sequence, format): diff --git a/docutils/test/test_parsers/test_rst/test_enumerated_lists.py b/docutils/test/test_parsers/test_rst/test_enumerated_lists.py index b0be498b4..6824efdbb 100755 --- a/docutils/test/test_parsers/test_rst/test_enumerated_lists.py +++ b/docutils/test/test_parsers/test_rst/test_enumerated_lists.py @@ -811,6 +811,16 @@ ii. Item two. #. Item two. 3. Item three. """], +["""\ +z. +x +""", +"""\ + + + z. + x +"""], ] -- 2.11.4.GIT