Changeset 514 for trunk/genshi/input.py

Timestamp:

Mar 20, 2007, 7:24:11 PM (17 years ago)

Author:

cmlenz

Message:

More work to include absolute file paths in exceptions.

File:

• trunk/genshi/input.py (modified) (4 diffs)

trunk/genshi/input.py

@@ -20 +20 @@
 import HTMLParser as html
 import htmlentitydefs
+import os
 from StringIO import StringIO
 
@@ -48 +49 @@
     parsed."""
 
-    def __init__(self, message, filename='<string>', lineno=-1, offset=-1):
+    def __init__(self, message, filename=None, lineno=-1, offset=-1):
+        self.msg = message
+        if filename:
+            message += ', in ' + os.path.basename(filename)
         Exception.__init__(self, message)
-        self.msg = message
-        self.filename = filename
+        self.filename = filename or '<string>'
         self.lineno = lineno
         self.offset = offset
@@ -143 +146 @@
             except expat.ExpatError, e:
                 msg = str(e)
-                if self.filename:
-                    msg += ', in ' + self.filename
                 raise ParseError(msg, self.filename, e.lineno, e.offset)
         return Stream(_generate()).filter(_coalesce)
@@ -294 +295 @@
             except html.HTMLParseError, e:
                 msg = '%s: line %d, column %d' % (e.msg, e.lineno, e.offset)
-                if self.filename:
-                    msg += ', in %s' % self.filename
                 raise ParseError(msg, self.filename, e.lineno, e.offset)
         return Stream(_generate()).filter(_coalesce)