[Lxml-checkins] r53642 - lxml/branch/lxml-2.0/src/lxml

[scoder at codespeak.net]

Author: scoder
Date: Thu Apr 10 08:02:08 2008
New Revision: 53642

Modified:
   lxml/branch/lxml-2.0/src/lxml/xmlerror.pxd
   lxml/branch/lxml-2.0/src/lxml/xmlerror.pxi
Log:
trunk merge -c 53641: new error constants as of libxml2 2.6.32

Modified: lxml/branch/lxml-2.0/src/lxml/xmlerror.pxd
==============================================================================
--- lxml/branch/lxml-2.0/src/lxml/xmlerror.pxd	(original)
+++ lxml/branch/lxml-2.0/src/lxml/xmlerror.pxd	Thu Apr 10 08:02:08 2008
@@ -39,6 +39,7 @@
         XML_FROM_WRITER                                    =      25 # The xmlwriter module
         XML_FROM_MODULE                                    =      26 # The dynamically loaded module modul
         XML_FROM_I18N                                      =      27 # The module handling character conversion
+        XML_FROM_SCHEMATRONV                               =      28 # The Schematron validator module
 
     ctypedef enum xmlParserErrors:
         XML_ERR_OK                                         =       0
@@ -345,6 +346,7 @@
         XML_TREE_INVALID_HEX                               =    1300
         XML_TREE_INVALID_DEC                               =    1301 # 1301
         XML_TREE_UNTERMINATED_ENTITY                       =    1302 # 1302
+        XML_TREE_NOT_UTF8                                  =    1303 # 1303
         XML_SAVE_NOT_UTF8                                  =    1400
         XML_SAVE_CHAR_INVALID                              =    1401 # 1401
         XML_SAVE_NO_DOCTYPE                                =    1402 # 1402
@@ -720,6 +722,8 @@
         XML_SCHEMAP_AU_PROPS_CORRECT                       =    3089 # 3088
         XML_SCHEMAP_A_PROPS_CORRECT_3                      =    3090 # 3089
         XML_SCHEMAP_COS_ALL_LIMITED                        =    3091 # 3090
+        XML_SCHEMATRONV_ASSERT                             =    4000 # 4000
+        XML_SCHEMATRONV_REPORT                             =    4001
         XML_MODULE_OPEN                                    =    4900 # 4900
         XML_MODULE_CLOSE                                   =    4901 # 4901
         XML_CHECK_FOUND_ELEMENT                            =    5000

Modified: lxml/branch/lxml-2.0/src/lxml/xmlerror.pxi
==============================================================================
--- lxml/branch/lxml-2.0/src/lxml/xmlerror.pxi	(original)
+++ lxml/branch/lxml-2.0/src/lxml/xmlerror.pxi	Thu Apr 10 08:02:08 2008
@@ -603,6 +603,7 @@
 WRITER=25
 MODULE=26
 I18N=27
+SCHEMATRONV=28
 """,)
 
 cdef object __PARSER_ERROR_TYPES
@@ -917,13 +918,14 @@
 TREE_INVALID_HEX=1300
 TREE_INVALID_DEC=1301
 TREE_UNTERMINATED_ENTITY=1302
+TREE_NOT_UTF8=1303
 SAVE_NOT_UTF8=1400
 SAVE_CHAR_INVALID=1401
 SAVE_NO_DOCTYPE=1402
 SAVE_UNKNOWN_ENCODING=1403
-REGEXP_COMPILE_ERROR=1450
 """,
 """\
+REGEXP_COMPILE_ERROR=1450
 IO_UNKNOWN=1500
 IO_EACCES=1501
 IO_EAGAIN=1502
@@ -1015,9 +1017,9 @@
 SCHEMAP_EXTENSION_NO_BASE=1707
 SCHEMAP_FACET_NO_VALUE=1708
 SCHEMAP_FAILED_BUILD_IMPORT=1709
-SCHEMAP_GROUP_NONAME_NOREF=1710
 """,
 """\
+SCHEMAP_GROUP_NONAME_NOREF=1710
 SCHEMAP_IMPORT_NAMESPACE_NOT_URI=1711
 SCHEMAP_IMPORT_REDEFINE_NSNAME=1712
 SCHEMAP_IMPORT_SCHEMA_NOT_URI=1713
@@ -1078,9 +1080,9 @@
 SCHEMAP_DEF_AND_PREFIX=1768
 SCHEMAP_UNKNOWN_INCLUDE_CHILD=1769
 SCHEMAP_INCLUDE_SCHEMA_NOT_URI=1770
-SCHEMAP_INCLUDE_SCHEMA_NO_URI=1771
 """,
 """\
+SCHEMAP_INCLUDE_SCHEMA_NO_URI=1771
 SCHEMAP_NOT_SCHEMA=1772
 SCHEMAP_UNKNOWN_MEMBER_TYPE=1773
 SCHEMAP_INVALID_ATTR_USE=1774
@@ -1143,9 +1145,9 @@
 SCHEMAV_CVC_MINLENGTH_VALID=1831
 SCHEMAV_CVC_MAXLENGTH_VALID=1832
 SCHEMAV_CVC_MININCLUSIVE_VALID=1833
-SCHEMAV_CVC_MAXINCLUSIVE_VALID=1834
 """,
 """\
+SCHEMAV_CVC_MAXINCLUSIVE_VALID=1834
 SCHEMAV_CVC_MINEXCLUSIVE_VALID=1835
 SCHEMAV_CVC_MAXEXCLUSIVE_VALID=1836
 SCHEMAV_CVC_TOTALDIGITS_VALID=1837
@@ -1214,9 +1216,9 @@
 SCHEMAP_SRC_SIMPLE_TYPE_4=3003
 SCHEMAP_SRC_RESOLVE=3004
 SCHEMAP_SRC_RESTRICTION_BASE_OR_SIMPLETYPE=3005
-SCHEMAP_SRC_LIST_ITEMTYPE_OR_SIMPLETYPE=3006
 """,
 """\
+SCHEMAP_SRC_LIST_ITEMTYPE_OR_SIMPLETYPE=3006
 SCHEMAP_SRC_UNION_MEMBERTYPES_OR_SIMPLETYPES=3007
 SCHEMAP_ST_PROPS_CORRECT_1=3008
 SCHEMAP_ST_PROPS_CORRECT_2=3009
@@ -1275,9 +1277,9 @@
 SCHEMAP_CVC_SIMPLE_TYPE=3062
 SCHEMAP_COS_CT_EXTENDS_1_1=3063
 SCHEMAP_SRC_IMPORT_1_1=3064
-SCHEMAP_SRC_IMPORT_1_2=3065
 """,
 """\
+SCHEMAP_SRC_IMPORT_1_2=3065
 SCHEMAP_SRC_IMPORT_2=3066
 SCHEMAP_SRC_IMPORT_2_1=3067
 SCHEMAP_SRC_IMPORT_2_2=3068
@@ -1304,6 +1306,8 @@
 SCHEMAP_AU_PROPS_CORRECT=3089
 SCHEMAP_A_PROPS_CORRECT_3=3090
 SCHEMAP_COS_ALL_LIMITED=3091
+SCHEMATRONV_ASSERT=4000
+SCHEMATRONV_REPORT=4001
 MODULE_OPEN=4900
 MODULE_CLOSE=4901
 CHECK_FOUND_ELEMENT=5000