[Lxml-checkins] r43363 - in lxml/trunk: . src/lxml src/lxml/tests

[scoder at codespeak.net]

Author: scoder
Date: Mon May 14 15:12:59 2007
New Revision: 43363

Modified:
   lxml/trunk/CHANGES.txt
   lxml/trunk/src/lxml/tests/test_etree.py
   lxml/trunk/src/lxml/xmlerror.pxd
   lxml/trunk/src/lxml/xmlerror.pxi
Log:
column field on error log entries

Modified: lxml/trunk/CHANGES.txt
==============================================================================
--- lxml/trunk/CHANGES.txt	(original)
+++ lxml/trunk/CHANGES.txt	Mon May 14 15:12:59 2007
@@ -8,6 +8,8 @@
 Features added
 --------------
 
+* ``column`` field on error log entries to accompany the ``line`` field
+
 * Error specific messages in XPath parsing and evaluation
   NOTE: for evaluation errors, you will now get an XPathEvalError instead of
   an XPathSyntaxError.  To catch both, you can except on ``XPathError``

Modified: lxml/trunk/src/lxml/tests/test_etree.py
==============================================================================
--- lxml/trunk/src/lxml/tests/test_etree.py	(original)
+++ lxml/trunk/src/lxml/tests/test_etree.py	Mon May 14 15:12:59 2007
@@ -183,6 +183,10 @@
                        if 'PARSER'   in log.domain_name])
         self.assert_([ log for log in logs
                        if 'TAG_NAME_MISMATCH' in log.type_name ])
+        self.assert_([ log for log in logs
+                       if 1 == log.line ])
+        self.assert_([ log for log in logs
+                       if 15 == log.column ])
 
     def test_parse_error_from_file(self):
         parse = self.etree.parse

Modified: lxml/trunk/src/lxml/xmlerror.pxd
==============================================================================
--- lxml/trunk/src/lxml/xmlerror.pxd	(original)
+++ lxml/trunk/src/lxml/xmlerror.pxd	Mon May 14 15:12:59 2007
@@ -780,6 +780,8 @@
         char* str2
         char* str3
         int line
+        int int1
+        int int2
 
     ctypedef void (*xmlGenericErrorFunc)(void* ctxt, char* msg, ...)
     ctypedef void (*xmlStructuredErrorFunc)(void* userData, xmlError* error)

Modified: lxml/trunk/src/lxml/xmlerror.pxi
==============================================================================
--- lxml/trunk/src/lxml/xmlerror.pxi	(original)
+++ lxml/trunk/src/lxml/xmlerror.pxi	Mon May 14 15:12:59 2007
@@ -36,15 +36,18 @@
     cdef readonly object domain
     cdef readonly object type
     cdef readonly object line
+    cdef readonly object column
     cdef readonly object level
     cdef readonly object message
     cdef readonly object filename
+
     cdef _setError(self, xmlerror.xmlError* error):
         cdef int size
         self.domain   = error.domain
         self.type     = error.code
         self.level    = <int>error.level
         self.line     = error.line
+        self.column   = error.int2
         size = cstd.strlen(error.message)
         if size > 0 and error.message[size-1] == c'\n':
             size = size - 1 # strip EOL