From: Fred Drake <fdrake@acm.org>
Date: Mon, 23 Nov 1998 16:30:18 +0000 (+0000)
Subject: Fix up the extraction of optional parameters a little.
X-Git-Tag: v1.5.2b1~206
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bbd7509dbe6865e8f74d155c6f149b27828361d7;p=python

Fix up the extraction of optional parameters a little.

Be more informative in an exception message.
---

diff --git a/Doc/tools/latex2esis.py b/Doc/tools/latex2esis.py
index d186a66f4b..afa2d86584 100755
--- a/Doc/tools/latex2esis.py
+++ b/Doc/tools/latex2esis.py
@@ -26,7 +26,7 @@ _end_env_rx = re.compile(r"[\\]end{([^}]*)}")
 _begin_macro_rx = re.compile("[\\\\]([a-zA-Z]+[*]?)({|\\s*\n?)")
 _comment_rx = re.compile("%+[ \t]*(.*)\n")
 _text_rx = re.compile(r"[^]%\\{}]+")
-_optional_rx = re.compile(r"[[]([^]]*)[]]")
+_optional_rx = re.compile(r"\s*[[]([^]]*)[]]")
 _parameter_rx = re.compile("[ \n]*{([^}]*)}")
 _token_rx = re.compile(r"[a-zA-Z][a-zA-Z0-9.-]*$")
 _start_group_rx = re.compile("[ \n]*{")
@@ -181,8 +181,8 @@ def subconvert(line, ofp, table, discards, autoclosing, knownempty,
                     m = _parameter_rx.match(line)
                     if not m:
                         raise LaTeXFormatError(
-                            "could not extract parameter group: "
-                            + `line`)
+                            "could not extract parameter %s for %s: %s"
+                            % (attrname, macroname, `line[:100]`))
                     value = m.group(1)
                     if _token_rx.match(value):
                         dtype = "TOKEN"