Changeset 259 for trunk/markup/input.py

Timestamp:

Aug 29, 2006, 6:34:40 PM (17 years ago)

Author:

cmlenz

Message:

• Fix bug in handling of undefined entities. Thanks to Arnar for reporting the issue on IRC.
• Enable the XMLParser to handle HTML entities without requiring the declaration of a HTML document type.

File:

• trunk/markup/input.py (modified) (2 diffs)

trunk/markup/input.py

@@ -81 +81 @@
         parser.ProcessingInstructionHandler = self._handle_pi
         parser.CommentHandler = self._handle_comment
+
+        # Tell Expat that we'll handle non-XML entities ourselves
+        # (in _handle_other)
         parser.DefaultHandler = self._handle_other
+        parser.UseForeignDTD()
 
         # Location reporting is only support in Python >= 2.4
@@ -185 +189 @@
                 self._enqueue(TEXT, text)
             except KeyError:
-                lineno, offset = self._getpos()
-                raise expat.error("undefined entity %s: line %d, column %d" %
-                                  (text, lineno, offset))
+                filename, lineno, offset = self._getpos()
+                error = expat.error('undefined entity "%s": line %d, column %d'
+                                    % (text, lineno, offset))
+                error.code = expat.errors.XML_ERROR_UNDEFINED_ENTITY
+                error.lineno = lineno
+                error.offset = offset
+                raise error