diff -u lxml-2.1.1/debian/control lxml-2.1.1/debian/control
--- lxml-2.1.1/debian/control
+++ lxml-2.1.1/debian/control
@@ -1,7 +1,8 @@
 Source: lxml
 Section: python
 Priority: optional
-Maintainer: Matthias Klose <doko@debian.org>
+Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Matthias Klose <doko@debian.org>
 Build-Depends: debhelper (>= 5.0.37.1), python-central (>= 0.6.1), python-all-dev (>= 2.3.5-9), python-all-dbg, python-pyrex (>= 0.9.4.1-1), libxml2-dev, libxslt1-dev, zlib1g-dev
 Build-Conflicts: python-pkg-resources
 XS-Python-Version: all
diff -u lxml-2.1.1/debian/changelog lxml-2.1.1/debian/changelog
--- lxml-2.1.1/debian/changelog
+++ lxml-2.1.1/debian/changelog
@@ -1,3 +1,22 @@
+lxml (2.1.1-1ubuntu1) intrepid-proposed; urgency=low
+
+  * python-lxml failed import of lxml etree module (LP: #308194).
+    To fix this we use patches from Debian Lenny version 2.1.1-2.1.
+  * src/lxml/lxml.etree.pyx: This is the site of the basic fix, modifying
+    one line:
+      -except ImportError:
+      +except (ImportError, AttributeError):
+    The change is performed in situ since the package does not employ a 
+    patch system.
+    Since this is in a *.pyx source file, the change spawns several others:
+  * We need to generate src/lxml/lxml.*.[ch] from the .pyx files, and
+    therefore need to add cython to Build-Depends. 
+  * Because cython needs to be run before compiling, debian/rules is
+    modified to perform this step, basically adding a "prebuild" target.
+  * Normal Ubuntu maintainer mangling.
+
+ -- Morten Kjeldgaard <mok0@ubuntu.com>  Tue, 16 Dec 2008 15:18:59 +0100
+  
 lxml (2.1.1-1) unstable; urgency=low
 
   * New upstream version.
only in patch2:
unchanged:
--- lxml-2.1.1.orig/src/lxml/lxml.etree.c
+++ lxml-2.1.1/src/lxml/lxml.etree.c
@@ -1,4 +1,4 @@
-/* Generated by Cython 0.9.6.14 on Thu Jul 24 09:02:25 2008 */
+/* Generated by Cython 0.9.8 on Tue Dec 16 15:17:27 2008 */
 
 #define PY_SSIZE_T_CLEAN
 #include "Python.h"
@@ -118305,28 +118305,8 @@
 
 static void __pyx_init_filenames(void); /*proto*/
 
-#if PY_MAJOR_VERSION >= 3
-static struct PyModuleDef __pyx_moduledef = {
-  PyModuleDef_HEAD_INIT,
-  "etree",
-  __pyx_mdoc, /* m_doc */
-  -1, /* m_size */
-  __pyx_methods /* m_methods */,
-  NULL, /* m_reload */
-  NULL, /* m_traverse */
-  NULL, /* m_clear */
-  NULL /* m_free */
-};
-#endif
-
-#if PY_MAJOR_VERSION < 3
 PyMODINIT_FUNC initetree(void); /*proto*/
-PyMODINIT_FUNC initetree(void)
-#else
-PyMODINIT_FUNC PyInit_etree(void); /*proto*/
-PyMODINIT_FUNC PyInit_etree(void)
-#endif
-{
+PyMODINIT_FUNC initetree(void) {
 PyObject *__pyx_1 = 0;
 int __pyx_2;
 PyObject *__pyx_3 = 0;
@@ -118344,15 +118324,9 @@
 /*--- Libary function declarations ---*/
 __pyx_init_filenames();
 /*--- Module creation code ---*/
-#if PY_MAJOR_VERSION < 3
 __pyx_m = Py_InitModule4("etree", __pyx_methods, __pyx_mdoc, 0, PYTHON_API_VERSION);
-#else
-__pyx_m = PyModule_Create(&__pyx_moduledef);
-#endif
 if (!__pyx_m) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1;};
-#if PY_MAJOR_VERSION < 3
 Py_INCREF(__pyx_m);
-#endif
 __pyx_b = PyImport_AddModule(__Pyx_BUILTIN_MODULE_NAME);
 if (!__pyx_b) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1;};
 if (PyObject_SetAttrString(__pyx_m, "__builtins__", __pyx_b) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1;};
@@ -119394,7 +119368,7 @@
  * cdef object BytesIO, StringIO
  * try:             # <<<<<<<<<<<<<<
  *     from io import BytesIO, StringIO
- * except ImportError:
+ * except (ImportError, AttributeError):
  */
 /*try:*/ {
 
@@ -119402,7 +119376,7 @@
  * cdef object BytesIO, StringIO
  * try:
  *     from io import BytesIO, StringIO             # <<<<<<<<<<<<<<
- * except ImportError:
+ * except (ImportError, AttributeError):
  *     from StringIO import StringIO, StringIO as BytesIO
  */
   __pyx_4 = PyList_New(2); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 40; __pyx_clineno = __LINE__; goto __pyx_L9;}
@@ -119433,41 +119407,47 @@
 /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/lxml.etree.pyx":41
  * try:
  *     from io import BytesIO, StringIO
- * except ImportError:             # <<<<<<<<<<<<<<
+ * except (ImportError, AttributeError):             # <<<<<<<<<<<<<<
  *     from StringIO import StringIO, StringIO as BytesIO
  * 
  */
-__pyx_2 = PyErr_ExceptionMatches(__pyx_builtin_ImportError);
+__pyx_1 = PyTuple_New(2); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 41; __pyx_clineno = __LINE__; goto __pyx_L1;}
+Py_INCREF(__pyx_builtin_ImportError);
+PyTuple_SET_ITEM(__pyx_1, 0, __pyx_builtin_ImportError);
+Py_INCREF(__pyx_builtin_AttributeError);
+PyTuple_SET_ITEM(__pyx_1, 1, __pyx_builtin_AttributeError);
+__pyx_2 = PyErr_ExceptionMatches(((PyObject *)__pyx_1));
+Py_DECREF(((PyObject *)__pyx_1)); __pyx_1 = 0;
 if (__pyx_2) {
   __Pyx_AddTraceback("lxml.etree");
-  if (__Pyx_GetException(&__pyx_1, &__pyx_3, &__pyx_4) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 41; __pyx_clineno = __LINE__; goto __pyx_L1;}
+  if (__Pyx_GetException(&__pyx_3, &__pyx_4, &__pyx_5) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 41; __pyx_clineno = __LINE__; goto __pyx_L1;}
 
   /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/lxml.etree.pyx":42
  *     from io import BytesIO, StringIO
- * except ImportError:
+ * except (ImportError, AttributeError):
  *     from StringIO import StringIO, StringIO as BytesIO             # <<<<<<<<<<<<<<
  * 
  * cdef object _elementpath
  */
-  __pyx_5 = PyList_New(2); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 42; __pyx_clineno = __LINE__; goto __pyx_L1;}
+  __pyx_6 = PyList_New(2); if (unlikely(!__pyx_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 42; __pyx_clineno = __LINE__; goto __pyx_L1;}
   Py_INCREF(__pyx_kp_StringIO);
-  PyList_SET_ITEM(__pyx_5, 0, __pyx_kp_StringIO);
+  PyList_SET_ITEM(__pyx_6, 0, __pyx_kp_StringIO);
   Py_INCREF(__pyx_kp_StringIO);
-  PyList_SET_ITEM(__pyx_5, 1, __pyx_kp_StringIO);
-  __pyx_6 = __Pyx_Import(__pyx_kp_StringIO, ((PyObject *)__pyx_5)); if (unlikely(!__pyx_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 42; __pyx_clineno = __LINE__; goto __pyx_L1;}
-  Py_DECREF(((PyObject *)__pyx_5)); __pyx_5 = 0;
-  __pyx_5 = PyObject_GetAttr(__pyx_6, __pyx_kp_StringIO); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 42; __pyx_clineno = __LINE__; goto __pyx_L1;}
+  PyList_SET_ITEM(__pyx_6, 1, __pyx_kp_StringIO);
+  __pyx_1 = __Pyx_Import(__pyx_kp_StringIO, ((PyObject *)__pyx_6)); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 42; __pyx_clineno = __LINE__; goto __pyx_L1;}
+  Py_DECREF(((PyObject *)__pyx_6)); __pyx_6 = 0;
+  __pyx_6 = PyObject_GetAttr(__pyx_1, __pyx_kp_StringIO); if (unlikely(!__pyx_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 42; __pyx_clineno = __LINE__; goto __pyx_L1;}
   Py_DECREF(__pyx_v_4lxml_5etree_StringIO);
-  __pyx_v_4lxml_5etree_StringIO = __pyx_5;
-  __pyx_5 = 0;
-  __pyx_5 = PyObject_GetAttr(__pyx_6, __pyx_kp_StringIO); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 42; __pyx_clineno = __LINE__; goto __pyx_L1;}
+  __pyx_v_4lxml_5etree_StringIO = __pyx_6;
+  __pyx_6 = 0;
+  __pyx_6 = PyObject_GetAttr(__pyx_1, __pyx_kp_StringIO); if (unlikely(!__pyx_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 42; __pyx_clineno = __LINE__; goto __pyx_L1;}
   Py_DECREF(__pyx_v_4lxml_5etree_BytesIO);
-  __pyx_v_4lxml_5etree_BytesIO = __pyx_5;
-  __pyx_5 = 0;
-  Py_DECREF(__pyx_6); __pyx_6 = 0;
+  __pyx_v_4lxml_5etree_BytesIO = __pyx_6;
+  __pyx_6 = 0;
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   Py_DECREF(__pyx_3); __pyx_3 = 0;
   Py_DECREF(__pyx_4); __pyx_4 = 0;
+  Py_DECREF(__pyx_5); __pyx_5 = 0;
   goto __pyx_L10;
 }
 goto __pyx_L1;
@@ -119480,10 +119460,10 @@
  * 
  * cdef object sys
  */
-__pyx_6 = __Pyx_Import(__pyx_kp__elementpath, 0); if (unlikely(!__pyx_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 45; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_1 = __Pyx_Import(__pyx_kp__elementpath, 0); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 45; __pyx_clineno = __LINE__; goto __pyx_L1;}
 Py_DECREF(__pyx_v_4lxml_5etree__elementpath);
-__pyx_v_4lxml_5etree__elementpath = __pyx_6;
-__pyx_6 = 0;
+__pyx_v_4lxml_5etree__elementpath = __pyx_1;
+__pyx_1 = 0;
 
 /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/lxml.etree.pyx":48
  * 
@@ -119492,10 +119472,10 @@
  * 
  * cdef object re
  */
-__pyx_5 = __Pyx_Import(__pyx_kp_sys, 0); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_6 = __Pyx_Import(__pyx_kp_sys, 0); if (unlikely(!__pyx_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1;}
 Py_DECREF(__pyx_v_4lxml_5etree_sys);
-__pyx_v_4lxml_5etree_sys = __pyx_5;
-__pyx_5 = 0;
+__pyx_v_4lxml_5etree_sys = __pyx_6;
+__pyx_6 = 0;
 
 /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/lxml.etree.pyx":51
  * 
@@ -119504,10 +119484,10 @@
  * 
  * cdef object ITER_EMPTY
  */
-__pyx_1 = __Pyx_Import(__pyx_kp_re, 0); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 51; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_3 = __Pyx_Import(__pyx_kp_re, 0); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 51; __pyx_clineno = __LINE__; goto __pyx_L1;}
 Py_DECREF(__pyx_v_4lxml_5etree_re);
-__pyx_v_4lxml_5etree_re = __pyx_1;
-__pyx_1 = 0;
+__pyx_v_4lxml_5etree_re = __pyx_3;
+__pyx_3 = 0;
 
 /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/lxml.etree.pyx":54
  * 
@@ -119516,10 +119496,10 @@
  * 
  * cdef object EMPTY_READ_ONLY_DICT
  */
-__pyx_3 = PyObject_GetIter(((PyObject *)__pyx_empty_tuple)); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 54; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_4 = PyObject_GetIter(((PyObject *)__pyx_empty_tuple)); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 54; __pyx_clineno = __LINE__; goto __pyx_L1;}
 Py_DECREF(__pyx_v_4lxml_5etree_ITER_EMPTY);
-__pyx_v_4lxml_5etree_ITER_EMPTY = __pyx_3;
-__pyx_3 = 0;
+__pyx_v_4lxml_5etree_ITER_EMPTY = __pyx_4;
+__pyx_4 = 0;
 
 /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/lxml.etree.pyx":57
  * 
@@ -119528,12 +119508,12 @@
  * 
  * # the rules
  */
-__pyx_4 = PyDict_New(); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 57; __pyx_clineno = __LINE__; goto __pyx_L1;}
-__pyx_6 = PyDictProxy_New(((PyObject *)__pyx_4)); if (unlikely(!__pyx_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 57; __pyx_clineno = __LINE__; goto __pyx_L1;}
-Py_DECREF(((PyObject *)__pyx_4)); __pyx_4 = 0;
+__pyx_5 = PyDict_New(); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 57; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_1 = PyDictProxy_New(((PyObject *)__pyx_5)); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 57; __pyx_clineno = __LINE__; goto __pyx_L1;}
+Py_DECREF(((PyObject *)__pyx_5)); __pyx_5 = 0;
 Py_DECREF(__pyx_v_4lxml_5etree_EMPTY_READ_ONLY_DICT);
-__pyx_v_4lxml_5etree_EMPTY_READ_ONLY_DICT = __pyx_6;
-__pyx_6 = 0;
+__pyx_v_4lxml_5etree_EMPTY_READ_ONLY_DICT = __pyx_1;
+__pyx_1 = 0;
 
 /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/lxml.etree.pyx":73
  * 
@@ -119587,12 +119567,12 @@
  * if _FILENAME_ENCODING is None:
  *     _FILENAME_ENCODING = sys.getdefaultencoding()
  */
-__pyx_5 = PyObject_GetAttr(__pyx_v_4lxml_5etree_sys, __pyx_kp_37); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 86; __pyx_clineno = __LINE__; goto __pyx_L1;}
-__pyx_1 = PyObject_Call(__pyx_5, ((PyObject *)__pyx_empty_tuple), NULL); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 86; __pyx_clineno = __LINE__; goto __pyx_L1;}
-Py_DECREF(__pyx_5); __pyx_5 = 0;
+__pyx_6 = PyObject_GetAttr(__pyx_v_4lxml_5etree_sys, __pyx_kp_37); if (unlikely(!__pyx_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 86; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_3 = PyObject_Call(__pyx_6, ((PyObject *)__pyx_empty_tuple), NULL); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 86; __pyx_clineno = __LINE__; goto __pyx_L1;}
+Py_DECREF(__pyx_6); __pyx_6 = 0;
 Py_DECREF(__pyx_v_4lxml_5etree__FILENAME_ENCODING);
-__pyx_v_4lxml_5etree__FILENAME_ENCODING = __pyx_1;
-__pyx_1 = 0;
+__pyx_v_4lxml_5etree__FILENAME_ENCODING = __pyx_3;
+__pyx_3 = 0;
 
 /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/lxml.etree.pyx":87
  * cdef object _FILENAME_ENCODING
@@ -119611,12 +119591,12 @@
  * if _FILENAME_ENCODING is None:
  *     _FILENAME_ENCODING = 'ascii'
  */
-  __pyx_3 = PyObject_GetAttr(__pyx_v_4lxml_5etree_sys, __pyx_kp_getdefaultencoding); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 88; __pyx_clineno = __LINE__; goto __pyx_L1;}
-  __pyx_4 = PyObject_Call(__pyx_3, ((PyObject *)__pyx_empty_tuple), NULL); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 88; __pyx_clineno = __LINE__; goto __pyx_L1;}
-  Py_DECREF(__pyx_3); __pyx_3 = 0;
+  __pyx_4 = PyObject_GetAttr(__pyx_v_4lxml_5etree_sys, __pyx_kp_getdefaultencoding); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 88; __pyx_clineno = __LINE__; goto __pyx_L1;}
+  __pyx_5 = PyObject_Call(__pyx_4, ((PyObject *)__pyx_empty_tuple), NULL); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 88; __pyx_clineno = __LINE__; goto __pyx_L1;}
+  Py_DECREF(__pyx_4); __pyx_4 = 0;
   Py_DECREF(__pyx_v_4lxml_5etree__FILENAME_ENCODING);
-  __pyx_v_4lxml_5etree__FILENAME_ENCODING = __pyx_4;
-  __pyx_4 = 0;
+  __pyx_v_4lxml_5etree__FILENAME_ENCODING = __pyx_5;
+  __pyx_5 = 0;
   goto __pyx_L11;
 }
 __pyx_L11:;
@@ -119652,16 +119632,16 @@
  * cdef char* _C_FILENAME_ENCODING
  * _C_FILENAME_ENCODING = _cstr(_FILENAME_ENCODING)
  */
-  __pyx_6 = PyObject_GetAttr(__pyx_v_4lxml_5etree__FILENAME_ENCODING, __pyx_kp_encode); if (unlikely(!__pyx_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 92; __pyx_clineno = __LINE__; goto __pyx_L1;}
-  __pyx_5 = PyTuple_New(1); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 92; __pyx_clineno = __LINE__; goto __pyx_L1;}
+  __pyx_1 = PyObject_GetAttr(__pyx_v_4lxml_5etree__FILENAME_ENCODING, __pyx_kp_encode); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 92; __pyx_clineno = __LINE__; goto __pyx_L1;}
+  __pyx_6 = PyTuple_New(1); if (unlikely(!__pyx_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 92; __pyx_clineno = __LINE__; goto __pyx_L1;}
   Py_INCREF(__pyx_kp_39);
-  PyTuple_SET_ITEM(__pyx_5, 0, __pyx_kp_39);
-  __pyx_1 = PyObject_Call(__pyx_6, ((PyObject *)__pyx_5), NULL); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 92; __pyx_clineno = __LINE__; goto __pyx_L1;}
-  Py_DECREF(__pyx_6); __pyx_6 = 0;
-  Py_DECREF(((PyObject *)__pyx_5)); __pyx_5 = 0;
+  PyTuple_SET_ITEM(__pyx_6, 0, __pyx_kp_39);
+  __pyx_3 = PyObject_Call(__pyx_1, ((PyObject *)__pyx_6), NULL); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 92; __pyx_clineno = __LINE__; goto __pyx_L1;}
+  Py_DECREF(__pyx_1); __pyx_1 = 0;
+  Py_DECREF(((PyObject *)__pyx_6)); __pyx_6 = 0;
   Py_DECREF(__pyx_v_4lxml_5etree__FILENAME_ENCODING);
-  __pyx_v_4lxml_5etree__FILENAME_ENCODING = __pyx_1;
-  __pyx_1 = 0;
+  __pyx_v_4lxml_5etree__FILENAME_ENCODING = __pyx_3;
+  __pyx_3 = 0;
 }
 __pyx_L12:;
 
@@ -119681,7 +119661,7 @@
  *     "http://www.w3.org/1999/xhtml": "html",
  *     "http://www.w3.org/1999/XSL/Transform": "xsl",
  */
-__pyx_3 = PyDict_New(); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 98; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_4 = PyDict_New(); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 98; __pyx_clineno = __LINE__; goto __pyx_L1;}
 
 /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/lxml.etree.pyx":99
  * cdef object _DEFAULT_NAMESPACE_PREFIXES
@@ -119690,7 +119670,7 @@
  *     "http://www.w3.org/1999/XSL/Transform": "xsl",
  *     "http://www.w3.org/1999/02/22-rdf-syntax-ns#": "rdf",
  */
-if (PyDict_SetItem(__pyx_3, __pyx_kp_40, __pyx_kp_41) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 98; __pyx_clineno = __LINE__; goto __pyx_L1;}
+if (PyDict_SetItem(__pyx_4, __pyx_kp_40, __pyx_kp_41) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 98; __pyx_clineno = __LINE__; goto __pyx_L1;}
 
 /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/lxml.etree.pyx":100
  * _DEFAULT_NAMESPACE_PREFIXES = {
@@ -119699,7 +119679,7 @@
  *     "http://www.w3.org/1999/02/22-rdf-syntax-ns#": "rdf",
  *     "http://schemas.xmlsoap.org/wsdl/": "wsdl",
  */
-if (PyDict_SetItem(__pyx_3, __pyx_kp_42, __pyx_kp_43) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 98; __pyx_clineno = __LINE__; goto __pyx_L1;}
+if (PyDict_SetItem(__pyx_4, __pyx_kp_42, __pyx_kp_43) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 98; __pyx_clineno = __LINE__; goto __pyx_L1;}
 
 /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/lxml.etree.pyx":101
  *     "http://www.w3.org/1999/xhtml": "html",
@@ -119708,7 +119688,7 @@
  *     "http://schemas.xmlsoap.org/wsdl/": "wsdl",
  *     # xml schema
  */
-if (PyDict_SetItem(__pyx_3, __pyx_kp_44, __pyx_kp_45) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 98; __pyx_clineno = __LINE__; goto __pyx_L1;}
+if (PyDict_SetItem(__pyx_4, __pyx_kp_44, __pyx_kp_45) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 98; __pyx_clineno = __LINE__; goto __pyx_L1;}
 
 /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/lxml.etree.pyx":102
  *     "http://www.w3.org/1999/XSL/Transform": "xsl",
@@ -119717,7 +119697,7 @@
  *     # xml schema
  *     "http://www.w3.org/2001/XMLSchema": "xs",
  */
-if (PyDict_SetItem(__pyx_3, __pyx_kp_46, __pyx_kp_47) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 98; __pyx_clineno = __LINE__; goto __pyx_L1;}
+if (PyDict_SetItem(__pyx_4, __pyx_kp_46, __pyx_kp_47) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 98; __pyx_clineno = __LINE__; goto __pyx_L1;}
 
 /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/lxml.etree.pyx":104
  *     "http://schemas.xmlsoap.org/wsdl/": "wsdl",
@@ -119726,7 +119706,7 @@
  *     "http://www.w3.org/2001/XMLSchema-instance": "xsi",
  *     # dublic core
  */
-if (PyDict_SetItem(__pyx_3, __pyx_kp_48, __pyx_kp_49) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 98; __pyx_clineno = __LINE__; goto __pyx_L1;}
+if (PyDict_SetItem(__pyx_4, __pyx_kp_48, __pyx_kp_49) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 98; __pyx_clineno = __LINE__; goto __pyx_L1;}
 
 /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/lxml.etree.pyx":105
  *     # xml schema
@@ -119735,7 +119715,7 @@
  *     # dublic core
  *     "http://purl.org/dc/elements/1.1/": "dc",
  */
-if (PyDict_SetItem(__pyx_3, __pyx_kp_50, __pyx_kp_51) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 98; __pyx_clineno = __LINE__; goto __pyx_L1;}
+if (PyDict_SetItem(__pyx_4, __pyx_kp_50, __pyx_kp_51) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 98; __pyx_clineno = __LINE__; goto __pyx_L1;}
 
 /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/lxml.etree.pyx":107
  *     "http://www.w3.org/2001/XMLSchema-instance": "xsi",
@@ -119744,7 +119724,7 @@
  *     # objectify
  *     "http://codespeak.net/lxml/objectify/pytype" : "py",
  */
-if (PyDict_SetItem(__pyx_3, __pyx_kp_52, __pyx_kp_53) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 98; __pyx_clineno = __LINE__; goto __pyx_L1;}
+if (PyDict_SetItem(__pyx_4, __pyx_kp_52, __pyx_kp_53) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 98; __pyx_clineno = __LINE__; goto __pyx_L1;}
 
 /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/lxml.etree.pyx":109
  *     "http://purl.org/dc/elements/1.1/": "dc",
@@ -119753,10 +119733,10 @@
  * }
  * 
  */
-if (PyDict_SetItem(__pyx_3, __pyx_kp_54, __pyx_kp_55) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 98; __pyx_clineno = __LINE__; goto __pyx_L1;}
+if (PyDict_SetItem(__pyx_4, __pyx_kp_54, __pyx_kp_55) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 98; __pyx_clineno = __LINE__; goto __pyx_L1;}
 Py_DECREF(__pyx_v_4lxml_5etree__DEFAULT_NAMESPACE_PREFIXES);
-__pyx_v_4lxml_5etree__DEFAULT_NAMESPACE_PREFIXES = ((PyObject *)__pyx_3);
-__pyx_3 = 0;
+__pyx_v_4lxml_5etree__DEFAULT_NAMESPACE_PREFIXES = ((PyObject *)__pyx_4);
+__pyx_4 = 0;
 
 /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/lxml.etree.pyx":113
  * 
@@ -119765,15 +119745,15 @@
  *     pass
  * 
  */
-__pyx_4 = PyDict_New(); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 113; __pyx_clineno = __LINE__; goto __pyx_L1;}
-__pyx_6 = PyTuple_New(1); if (unlikely(!__pyx_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 113; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_5 = PyDict_New(); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 113; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_1 = PyTuple_New(1); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 113; __pyx_clineno = __LINE__; goto __pyx_L1;}
 Py_INCREF(__pyx_builtin_Exception);
-PyTuple_SET_ITEM(__pyx_6, 0, __pyx_builtin_Exception);
-__pyx_5 = __Pyx_CreateClass(((PyObject *)__pyx_6), ((PyObject *)__pyx_4), __pyx_kp_Error, "lxml.etree"); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 113; __pyx_clineno = __LINE__; goto __pyx_L1;}
-Py_DECREF(((PyObject *)__pyx_6)); __pyx_6 = 0;
-if (PyObject_SetAttr(__pyx_m, __pyx_kp_Error, __pyx_5) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 113; __pyx_clineno = __LINE__; goto __pyx_L1;}
-Py_DECREF(__pyx_5); __pyx_5 = 0;
-Py_DECREF(((PyObject *)__pyx_4)); __pyx_4 = 0;
+PyTuple_SET_ITEM(__pyx_1, 0, __pyx_builtin_Exception);
+__pyx_6 = __Pyx_CreateClass(((PyObject *)__pyx_1), ((PyObject *)__pyx_5), __pyx_kp_Error, "lxml.etree"); if (unlikely(!__pyx_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 113; __pyx_clineno = __LINE__; goto __pyx_L1;}
+Py_DECREF(((PyObject *)__pyx_1)); __pyx_1 = 0;
+if (PyObject_SetAttr(__pyx_m, __pyx_kp_Error, __pyx_6) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 113; __pyx_clineno = __LINE__; goto __pyx_L1;}
+Py_DECREF(__pyx_6); __pyx_6 = 0;
+Py_DECREF(((PyObject *)__pyx_5)); __pyx_5 = 0;
 
 /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/lxml.etree.pyx":117
  * 
@@ -119782,14 +119762,14 @@
  *     u"""Main exception base class for lxml.  All other exceptions inherit from
  *     this one.
  */
-__pyx_1 = PyDict_New(); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 117; __pyx_clineno = __LINE__; goto __pyx_L1;}
-__pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_Error); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 117; __pyx_clineno = __LINE__; goto __pyx_L1;}
-__pyx_6 = PyTuple_New(1); if (unlikely(!__pyx_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 117; __pyx_clineno = __LINE__; goto __pyx_L1;}
-PyTuple_SET_ITEM(__pyx_6, 0, __pyx_3);
-__pyx_3 = 0;
-if (PyDict_SetItemString(((PyObject *)__pyx_1), "__doc__", __pyx_kp_56) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 117; __pyx_clineno = __LINE__; goto __pyx_L1;}
-__pyx_5 = __Pyx_CreateClass(((PyObject *)__pyx_6), ((PyObject *)__pyx_1), __pyx_kp_LxmlError, "lxml.etree"); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 117; __pyx_clineno = __LINE__; goto __pyx_L1;}
-Py_DECREF(((PyObject *)__pyx_6)); __pyx_6 = 0;
+__pyx_3 = PyDict_New(); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 117; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_Error); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 117; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_1 = PyTuple_New(1); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 117; __pyx_clineno = __LINE__; goto __pyx_L1;}
+PyTuple_SET_ITEM(__pyx_1, 0, __pyx_4);
+__pyx_4 = 0;
+if (PyDict_SetItemString(((PyObject *)__pyx_3), "__doc__", __pyx_kp_56) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 117; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_6 = __Pyx_CreateClass(((PyObject *)__pyx_1), ((PyObject *)__pyx_3), __pyx_kp_LxmlError, "lxml.etree"); if (unlikely(!__pyx_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 117; __pyx_clineno = __LINE__; goto __pyx_L1;}
+Py_DECREF(((PyObject *)__pyx_1)); __pyx_1 = 0;
 
 /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/lxml.etree.pyx":121
  *     this one.
@@ -119798,14 +119778,14 @@
  *         if python.PY_VERSION_HEX >= 0x02050000:
  *             # Python >= 2.5 uses new style class exceptions
  */
-__pyx_4 = PyCFunction_New(&__pyx_mdef_4lxml_5etree_9LxmlError___init__, 0); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 121; __pyx_clineno = __LINE__; goto __pyx_L1;}
-__pyx_3 = PyMethod_New(__pyx_4, 0, __pyx_5); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 121; __pyx_clineno = __LINE__; goto __pyx_L1;}
-Py_DECREF(__pyx_4); __pyx_4 = 0;
-if (PyObject_SetAttr(__pyx_5, __pyx_kp___init__, __pyx_3) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 121; __pyx_clineno = __LINE__; goto __pyx_L1;}
-Py_DECREF(__pyx_3); __pyx_3 = 0;
-if (PyObject_SetAttr(__pyx_m, __pyx_kp_LxmlError, __pyx_5) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 117; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_5 = PyCFunction_New(&__pyx_mdef_4lxml_5etree_9LxmlError___init__, 0); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 121; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_4 = PyMethod_New(__pyx_5, 0, __pyx_6); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 121; __pyx_clineno = __LINE__; goto __pyx_L1;}
 Py_DECREF(__pyx_5); __pyx_5 = 0;
-Py_DECREF(((PyObject *)__pyx_1)); __pyx_1 = 0;
+if (PyObject_SetAttr(__pyx_6, __pyx_kp___init__, __pyx_4) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 121; __pyx_clineno = __LINE__; goto __pyx_L1;}
+Py_DECREF(__pyx_4); __pyx_4 = 0;
+if (PyObject_SetAttr(__pyx_m, __pyx_kp_LxmlError, __pyx_6) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 117; __pyx_clineno = __LINE__; goto __pyx_L1;}
+Py_DECREF(__pyx_6); __pyx_6 = 0;
+Py_DECREF(((PyObject *)__pyx_3)); __pyx_3 = 0;
 
 /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/lxml.etree.pyx":133
  * 
@@ -119814,10 +119794,10 @@
  * 
  * cdef object error_super_init
  */
-__pyx_6 = __Pyx_GetName(__pyx_m, __pyx_kp_LxmlError); if (unlikely(!__pyx_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 133; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_LxmlError); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 133; __pyx_clineno = __LINE__; goto __pyx_L1;}
 Py_DECREF(__pyx_v_4lxml_5etree__LxmlError);
-__pyx_v_4lxml_5etree__LxmlError = __pyx_6;
-__pyx_6 = 0;
+__pyx_v_4lxml_5etree__LxmlError = __pyx_1;
+__pyx_1 = 0;
 
 /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/lxml.etree.pyx":136
  * 
@@ -119826,12 +119806,12 @@
  * 
  * 
  */
-__pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_Error); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 136; __pyx_clineno = __LINE__; goto __pyx_L1;}
-__pyx_3 = PyObject_GetAttr(__pyx_4, __pyx_kp___init__); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 136; __pyx_clineno = __LINE__; goto __pyx_L1;}
-Py_DECREF(__pyx_4); __pyx_4 = 0;
+__pyx_5 = __Pyx_GetName(__pyx_m, __pyx_kp_Error); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 136; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_4 = PyObject_GetAttr(__pyx_5, __pyx_kp___init__); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 136; __pyx_clineno = __LINE__; goto __pyx_L1;}
+Py_DECREF(__pyx_5); __pyx_5 = 0;
 Py_DECREF(__pyx_v_4lxml_5etree_error_super_init);
-__pyx_v_4lxml_5etree_error_super_init = __pyx_3;
-__pyx_3 = 0;
+__pyx_v_4lxml_5etree_error_super_init = __pyx_4;
+__pyx_4 = 0;
 
 /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/lxml.etree.pyx":140
  * 
@@ -119840,19 +119820,19 @@
  *     u"""Base class for all syntax errors.
  *     """
  */
-__pyx_5 = PyDict_New(); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 140; __pyx_clineno = __LINE__; goto __pyx_L1;}
-__pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_LxmlError); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 140; __pyx_clineno = __LINE__; goto __pyx_L1;}
-__pyx_6 = PyTuple_New(2); if (unlikely(!__pyx_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 140; __pyx_clineno = __LINE__; goto __pyx_L1;}
-PyTuple_SET_ITEM(__pyx_6, 0, __pyx_1);
+__pyx_6 = PyDict_New(); if (unlikely(!__pyx_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 140; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_LxmlError); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 140; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_1 = PyTuple_New(2); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 140; __pyx_clineno = __LINE__; goto __pyx_L1;}
+PyTuple_SET_ITEM(__pyx_1, 0, __pyx_3);
 Py_INCREF(__pyx_builtin_SyntaxError);
-PyTuple_SET_ITEM(__pyx_6, 1, __pyx_builtin_SyntaxError);
-__pyx_1 = 0;
-if (PyDict_SetItemString(((PyObject *)__pyx_5), "__doc__", __pyx_kp_57) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 140; __pyx_clineno = __LINE__; goto __pyx_L1;}
-__pyx_4 = __Pyx_CreateClass(((PyObject *)__pyx_6), ((PyObject *)__pyx_5), __pyx_kp_LxmlSyntaxError, "lxml.etree"); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 140; __pyx_clineno = __LINE__; goto __pyx_L1;}
+PyTuple_SET_ITEM(__pyx_1, 1, __pyx_builtin_SyntaxError);
+__pyx_3 = 0;
+if (PyDict_SetItemString(((PyObject *)__pyx_6), "__doc__", __pyx_kp_57) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 140; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_5 = __Pyx_CreateClass(((PyObject *)__pyx_1), ((PyObject *)__pyx_6), __pyx_kp_LxmlSyntaxError, "lxml.etree"); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 140; __pyx_clineno = __LINE__; goto __pyx_L1;}
+Py_DECREF(((PyObject *)__pyx_1)); __pyx_1 = 0;
+if (PyObject_SetAttr(__pyx_m, __pyx_kp_LxmlSyntaxError, __pyx_5) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 140; __pyx_clineno = __LINE__; goto __pyx_L1;}
+Py_DECREF(__pyx_5); __pyx_5 = 0;
 Py_DECREF(((PyObject *)__pyx_6)); __pyx_6 = 0;
-if (PyObject_SetAttr(__pyx_m, __pyx_kp_LxmlSyntaxError, __pyx_4) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 140; __pyx_clineno = __LINE__; goto __pyx_L1;}
-Py_DECREF(__pyx_4); __pyx_4 = 0;
-Py_DECREF(((PyObject *)__pyx_5)); __pyx_5 = 0;
 
 /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/lxml.etree.pyx":145
  *     pass
@@ -119861,17 +119841,17 @@
  *     u"""Error during C14N serialisation.
  *     """
  */
-__pyx_3 = PyDict_New(); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 145; __pyx_clineno = __LINE__; goto __pyx_L1;}
-__pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_LxmlError); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 145; __pyx_clineno = __LINE__; goto __pyx_L1;}
-__pyx_6 = PyTuple_New(1); if (unlikely(!__pyx_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 145; __pyx_clineno = __LINE__; goto __pyx_L1;}
-PyTuple_SET_ITEM(__pyx_6, 0, __pyx_1);
-__pyx_1 = 0;
-if (PyDict_SetItemString(((PyObject *)__pyx_3), "__doc__", __pyx_kp_59) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 145; __pyx_clineno = __LINE__; goto __pyx_L1;}
-__pyx_4 = __Pyx_CreateClass(((PyObject *)__pyx_6), ((PyObject *)__pyx_3), __pyx_kp_58, "lxml.etree"); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 145; __pyx_clineno = __LINE__; goto __pyx_L1;}
-Py_DECREF(((PyObject *)__pyx_6)); __pyx_6 = 0;
-if (PyObject_SetAttr(__pyx_m, __pyx_kp_58, __pyx_4) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 145; __pyx_clineno = __LINE__; goto __pyx_L1;}
-Py_DECREF(__pyx_4); __pyx_4 = 0;
-Py_DECREF(((PyObject *)__pyx_3)); __pyx_3 = 0;
+__pyx_4 = PyDict_New(); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 145; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_LxmlError); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 145; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_1 = PyTuple_New(1); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 145; __pyx_clineno = __LINE__; goto __pyx_L1;}
+PyTuple_SET_ITEM(__pyx_1, 0, __pyx_3);
+__pyx_3 = 0;
+if (PyDict_SetItemString(((PyObject *)__pyx_4), "__doc__", __pyx_kp_59) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 145; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_5 = __Pyx_CreateClass(((PyObject *)__pyx_1), ((PyObject *)__pyx_4), __pyx_kp_58, "lxml.etree"); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 145; __pyx_clineno = __LINE__; goto __pyx_L1;}
+Py_DECREF(((PyObject *)__pyx_1)); __pyx_1 = 0;
+if (PyObject_SetAttr(__pyx_m, __pyx_kp_58, __pyx_5) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 145; __pyx_clineno = __LINE__; goto __pyx_L1;}
+Py_DECREF(__pyx_5); __pyx_5 = 0;
+Py_DECREF(((PyObject *)__pyx_4)); __pyx_4 = 0;
 
 /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/lxml.etree.pyx":182
  * 
@@ -119889,48 +119869,48 @@
  * except Exception:
  *     print u"Unknown libxml2 version: %s" % (tree.xmlParserVersion).decode(u"ASCII")
  */
-  __pyx_5 = PyObject_GetAttr(__pyx_v_4lxml_5etree_re, __pyx_kp_match); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 184; __pyx_clineno = __LINE__; goto __pyx_L13;}
-  __pyx_1 = __Pyx_PyBytes_FromString(xmlParserVersion); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 184; __pyx_clineno = __LINE__; goto __pyx_L13;}
-  __pyx_6 = PyObject_GetAttr(__pyx_1, __pyx_kp_decode); if (unlikely(!__pyx_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 184; __pyx_clineno = __LINE__; goto __pyx_L13;}
-  Py_DECREF(__pyx_1); __pyx_1 = 0;
-  __pyx_4 = PyTuple_New(1); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 184; __pyx_clineno = __LINE__; goto __pyx_L13;}
+  __pyx_6 = PyObject_GetAttr(__pyx_v_4lxml_5etree_re, __pyx_kp_match); if (unlikely(!__pyx_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 184; __pyx_clineno = __LINE__; goto __pyx_L13;}
+  __pyx_3 = __Pyx_PyBytes_FromString(xmlParserVersion); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 184; __pyx_clineno = __LINE__; goto __pyx_L13;}
+  __pyx_1 = PyObject_GetAttr(__pyx_3, __pyx_kp_decode); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 184; __pyx_clineno = __LINE__; goto __pyx_L13;}
+  Py_DECREF(__pyx_3); __pyx_3 = 0;
+  __pyx_5 = PyTuple_New(1); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 184; __pyx_clineno = __LINE__; goto __pyx_L13;}
   Py_INCREF(__pyx_kp_61);
-  PyTuple_SET_ITEM(__pyx_4, 0, __pyx_kp_61);
-  __pyx_3 = PyObject_Call(__pyx_6, ((PyObject *)__pyx_4), NULL); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 184; __pyx_clineno = __LINE__; goto __pyx_L13;}
-  Py_DECREF(__pyx_6); __pyx_6 = 0;
-  Py_DECREF(((PyObject *)__pyx_4)); __pyx_4 = 0;
-  __pyx_1 = PyTuple_New(2); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 184; __pyx_clineno = __LINE__; goto __pyx_L13;}
+  PyTuple_SET_ITEM(__pyx_5, 0, __pyx_kp_61);
+  __pyx_4 = PyObject_Call(__pyx_1, ((PyObject *)__pyx_5), NULL); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 184; __pyx_clineno = __LINE__; goto __pyx_L13;}
+  Py_DECREF(__pyx_1); __pyx_1 = 0;
+  Py_DECREF(((PyObject *)__pyx_5)); __pyx_5 = 0;
+  __pyx_3 = PyTuple_New(2); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 184; __pyx_clineno = __LINE__; goto __pyx_L13;}
   Py_INCREF(__pyx_kp_60);
-  PyTuple_SET_ITEM(__pyx_1, 0, __pyx_kp_60);
-  PyTuple_SET_ITEM(__pyx_1, 1, __pyx_3);
-  __pyx_3 = 0;
-  __pyx_6 = PyObject_Call(__pyx_5, ((PyObject *)__pyx_1), NULL); if (unlikely(!__pyx_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 184; __pyx_clineno = __LINE__; goto __pyx_L13;}
-  Py_DECREF(__pyx_5); __pyx_5 = 0;
-  Py_DECREF(((PyObject *)__pyx_1)); __pyx_1 = 0;
-  __pyx_4 = PyObject_GetAttr(__pyx_6, __pyx_kp_group); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 184; __pyx_clineno = __LINE__; goto __pyx_L13;}
+  PyTuple_SET_ITEM(__pyx_3, 0, __pyx_kp_60);
+  PyTuple_SET_ITEM(__pyx_3, 1, __pyx_4);
+  __pyx_4 = 0;
+  __pyx_1 = PyObject_Call(__pyx_6, ((PyObject *)__pyx_3), NULL); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 184; __pyx_clineno = __LINE__; goto __pyx_L13;}
   Py_DECREF(__pyx_6); __pyx_6 = 0;
-  __pyx_3 = PyTuple_New(1); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 184; __pyx_clineno = __LINE__; goto __pyx_L13;}
+  Py_DECREF(((PyObject *)__pyx_3)); __pyx_3 = 0;
+  __pyx_5 = PyObject_GetAttr(__pyx_1, __pyx_kp_group); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 184; __pyx_clineno = __LINE__; goto __pyx_L13;}
+  Py_DECREF(__pyx_1); __pyx_1 = 0;
+  __pyx_4 = PyTuple_New(1); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 184; __pyx_clineno = __LINE__; goto __pyx_L13;}
   Py_INCREF(__pyx_int_0);
-  PyTuple_SET_ITEM(__pyx_3, 0, __pyx_int_0);
-  __pyx_5 = PyObject_Call(__pyx_4, ((PyObject *)__pyx_3), NULL); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 184; __pyx_clineno = __LINE__; goto __pyx_L13;}
-  Py_DECREF(__pyx_4); __pyx_4 = 0;
+  PyTuple_SET_ITEM(__pyx_4, 0, __pyx_int_0);
+  __pyx_6 = PyObject_Call(__pyx_5, ((PyObject *)__pyx_4), NULL); if (unlikely(!__pyx_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 184; __pyx_clineno = __LINE__; goto __pyx_L13;}
+  Py_DECREF(__pyx_5); __pyx_5 = 0;
+  Py_DECREF(((PyObject *)__pyx_4)); __pyx_4 = 0;
+  __pyx_3 = PyTuple_New(1); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 183; __pyx_clineno = __LINE__; goto __pyx_L13;}
+  PyTuple_SET_ITEM(__pyx_3, 0, __pyx_6);
+  __pyx_6 = 0;
+  __pyx_1 = PyObject_Call(((PyObject*)&PyInt_Type), ((PyObject *)__pyx_3), NULL); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 183; __pyx_clineno = __LINE__; goto __pyx_L13;}
   Py_DECREF(((PyObject *)__pyx_3)); __pyx_3 = 0;
-  __pyx_1 = PyTuple_New(1); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 183; __pyx_clineno = __LINE__; goto __pyx_L13;}
-  PyTuple_SET_ITEM(__pyx_1, 0, __pyx_5);
-  __pyx_5 = 0;
-  __pyx_6 = PyObject_Call(((PyObject*)&PyInt_Type), ((PyObject *)__pyx_1), NULL); if (unlikely(!__pyx_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 183; __pyx_clineno = __LINE__; goto __pyx_L13;}
-  Py_DECREF(((PyObject *)__pyx_1)); __pyx_1 = 0;
-  __pyx_2 = __pyx_PyInt_int(__pyx_6); if (unlikely((__pyx_2 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 183; __pyx_clineno = __LINE__; goto __pyx_L13;}
-  Py_DECREF(__pyx_6); __pyx_6 = 0;
+  __pyx_2 = __pyx_PyInt_int(__pyx_1); if (unlikely((__pyx_2 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 183; __pyx_clineno = __LINE__; goto __pyx_L13;}
+  Py_DECREF(__pyx_1); __pyx_1 = 0;
   __pyx_v_4lxml_5etree__LIBXML_VERSION_INT = __pyx_2;
 }
 goto __pyx_L14;
 __pyx_L13:;
+Py_XDECREF(__pyx_5); __pyx_5 = 0;
 Py_XDECREF(__pyx_4); __pyx_4 = 0;
+Py_XDECREF(__pyx_6); __pyx_6 = 0;
 Py_XDECREF(__pyx_3); __pyx_3 = 0;
-Py_XDECREF(__pyx_5); __pyx_5 = 0;
 Py_XDECREF(__pyx_1); __pyx_1 = 0;
-Py_XDECREF(__pyx_6); __pyx_6 = 0;
 
 /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/lxml.etree.pyx":185
  *     _LIBXML_VERSION_INT = int(
@@ -119942,7 +119922,7 @@
 __pyx_2 = PyErr_ExceptionMatches(__pyx_builtin_Exception);
 if (__pyx_2) {
   __Pyx_AddTraceback("lxml.etree");
-  if (__Pyx_GetException(&__pyx_4, &__pyx_3, &__pyx_5) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 185; __pyx_clineno = __LINE__; goto __pyx_L1;}
+  if (__Pyx_GetException(&__pyx_5, &__pyx_4, &__pyx_6) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 185; __pyx_clineno = __LINE__; goto __pyx_L1;}
 
   /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/lxml.etree.pyx":186
  *         re.match(u'[0-9]+', (tree.xmlParserVersion).decode(u"ASCII")).group(0))
@@ -119951,22 +119931,22 @@
  *     _LIBXML_VERSION_INT = 0
  * 
  */
-  __pyx_1 = __Pyx_PyBytes_FromString(xmlParserVersion); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 186; __pyx_clineno = __LINE__; goto __pyx_L1;}
-  __pyx_6 = PyObject_GetAttr(__pyx_1, __pyx_kp_decode); if (unlikely(!__pyx_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 186; __pyx_clineno = __LINE__; goto __pyx_L1;}
-  Py_DECREF(__pyx_1); __pyx_1 = 0;
-  __pyx_1 = PyTuple_New(1); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 186; __pyx_clineno = __LINE__; goto __pyx_L1;}
+  __pyx_3 = __Pyx_PyBytes_FromString(xmlParserVersion); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 186; __pyx_clineno = __LINE__; goto __pyx_L1;}
+  __pyx_1 = PyObject_GetAttr(__pyx_3, __pyx_kp_decode); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 186; __pyx_clineno = __LINE__; goto __pyx_L1;}
+  Py_DECREF(__pyx_3); __pyx_3 = 0;
+  __pyx_3 = PyTuple_New(1); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 186; __pyx_clineno = __LINE__; goto __pyx_L1;}
   Py_INCREF(__pyx_kp_63);
-  PyTuple_SET_ITEM(__pyx_1, 0, __pyx_kp_63);
-  __pyx_8 = PyObject_Call(__pyx_6, ((PyObject *)__pyx_1), NULL); if (unlikely(!__pyx_8)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 186; __pyx_clineno = __LINE__; goto __pyx_L1;}
-  Py_DECREF(__pyx_6); __pyx_6 = 0;
-  Py_DECREF(((PyObject *)__pyx_1)); __pyx_1 = 0;
-  __pyx_6 = PyNumber_Remainder(__pyx_kp_62, __pyx_8); if (unlikely(!__pyx_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 186; __pyx_clineno = __LINE__; goto __pyx_L1;}
+  PyTuple_SET_ITEM(__pyx_3, 0, __pyx_kp_63);
+  __pyx_8 = PyObject_Call(__pyx_1, ((PyObject *)__pyx_3), NULL); if (unlikely(!__pyx_8)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 186; __pyx_clineno = __LINE__; goto __pyx_L1;}
+  Py_DECREF(__pyx_1); __pyx_1 = 0;
+  Py_DECREF(((PyObject *)__pyx_3)); __pyx_3 = 0;
+  __pyx_1 = PyNumber_Remainder(__pyx_kp_62, __pyx_8); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 186; __pyx_clineno = __LINE__; goto __pyx_L1;}
   Py_DECREF(__pyx_8); __pyx_8 = 0;
-  __pyx_1 = PyTuple_New(1); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 186; __pyx_clineno = __LINE__; goto __pyx_L1;}
-  PyTuple_SET_ITEM(__pyx_1, 0, __pyx_6);
-  __pyx_6 = 0;
-  if (__Pyx_Print(((PyObject *)__pyx_1), 1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 186; __pyx_clineno = __LINE__; goto __pyx_L1;}
-  Py_DECREF(((PyObject *)__pyx_1)); __pyx_1 = 0;
+  __pyx_3 = PyTuple_New(1); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 186; __pyx_clineno = __LINE__; goto __pyx_L1;}
+  PyTuple_SET_ITEM(__pyx_3, 0, __pyx_1);
+  __pyx_1 = 0;
+  if (__Pyx_Print(((PyObject *)__pyx_3), 1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 186; __pyx_clineno = __LINE__; goto __pyx_L1;}
+  Py_DECREF(((PyObject *)__pyx_3)); __pyx_3 = 0;
 
   /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/lxml.etree.pyx":187
  * except Exception:
@@ -119976,9 +119956,9 @@
  * LIBXML_VERSION = __unpackIntVersion(_LIBXML_VERSION_INT)
  */
   __pyx_v_4lxml_5etree__LIBXML_VERSION_INT = 0;
-  Py_DECREF(__pyx_4); __pyx_4 = 0;
-  Py_DECREF(__pyx_3); __pyx_3 = 0;
   Py_DECREF(__pyx_5); __pyx_5 = 0;
+  Py_DECREF(__pyx_4); __pyx_4 = 0;
+  Py_DECREF(__pyx_6); __pyx_6 = 0;
   goto __pyx_L14;
 }
 goto __pyx_L1;
@@ -120002,9 +119982,9 @@
  * LXML_VERSION = __unpackDottedVersion(tree.LXML_VERSION_STRING)
  * 
  */
-__pyx_6 = __pyx_f_4lxml_5etree___unpackIntVersion(LIBXML_VERSION); if (unlikely(!__pyx_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 190; __pyx_clineno = __LINE__; goto __pyx_L1;}
-if (PyObject_SetAttr(__pyx_m, __pyx_kp_64, __pyx_6) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 190; __pyx_clineno = __LINE__; goto __pyx_L1;}
-Py_DECREF(__pyx_6); __pyx_6 = 0;
+__pyx_1 = __pyx_f_4lxml_5etree___unpackIntVersion(LIBXML_VERSION); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 190; __pyx_clineno = __LINE__; goto __pyx_L1;}
+if (PyObject_SetAttr(__pyx_m, __pyx_kp_64, __pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 190; __pyx_clineno = __LINE__; goto __pyx_L1;}
+Py_DECREF(__pyx_1); __pyx_1 = 0;
 
 /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/lxml.etree.pyx":191
  * LIBXML_VERSION = __unpackIntVersion(_LIBXML_VERSION_INT)
@@ -120013,11 +119993,11 @@
  * 
  * __version__ = (tree.LXML_VERSION_STRING).decode(u"ASCII")
  */
-__pyx_1 = __Pyx_PyBytes_FromString(LXML_VERSION_STRING); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 191; __pyx_clineno = __LINE__; goto __pyx_L1;}
-__pyx_4 = __pyx_f_4lxml_5etree___unpackDottedVersion(__pyx_1); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 191; __pyx_clineno = __LINE__; goto __pyx_L1;}
-Py_DECREF(__pyx_1); __pyx_1 = 0;
-if (PyObject_SetAttr(__pyx_m, __pyx_kp_LXML_VERSION, __pyx_4) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 191; __pyx_clineno = __LINE__; goto __pyx_L1;}
-Py_DECREF(__pyx_4); __pyx_4 = 0;
+__pyx_3 = __Pyx_PyBytes_FromString(LXML_VERSION_STRING); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 191; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_5 = __pyx_f_4lxml_5etree___unpackDottedVersion(__pyx_3); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 191; __pyx_clineno = __LINE__; goto __pyx_L1;}
+Py_DECREF(__pyx_3); __pyx_3 = 0;
+if (PyObject_SetAttr(__pyx_m, __pyx_kp_LXML_VERSION, __pyx_5) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 191; __pyx_clineno = __LINE__; goto __pyx_L1;}
+Py_DECREF(__pyx_5); __pyx_5 = 0;
 
 /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/lxml.etree.pyx":193
  * LXML_VERSION = __unpackDottedVersion(tree.LXML_VERSION_STRING)
@@ -120026,17 +120006,17 @@
  * 
  * 
  */
-__pyx_3 = __Pyx_PyBytes_FromString(LXML_VERSION_STRING); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 193; __pyx_clineno = __LINE__; goto __pyx_L1;}
-__pyx_5 = PyObject_GetAttr(__pyx_3, __pyx_kp_decode); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 193; __pyx_clineno = __LINE__; goto __pyx_L1;}
-Py_DECREF(__pyx_3); __pyx_3 = 0;
+__pyx_4 = __Pyx_PyBytes_FromString(LXML_VERSION_STRING); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 193; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_6 = PyObject_GetAttr(__pyx_4, __pyx_kp_decode); if (unlikely(!__pyx_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 193; __pyx_clineno = __LINE__; goto __pyx_L1;}
+Py_DECREF(__pyx_4); __pyx_4 = 0;
 __pyx_8 = PyTuple_New(1); if (unlikely(!__pyx_8)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 193; __pyx_clineno = __LINE__; goto __pyx_L1;}
 Py_INCREF(__pyx_kp_65);
 PyTuple_SET_ITEM(__pyx_8, 0, __pyx_kp_65);
-__pyx_6 = PyObject_Call(__pyx_5, ((PyObject *)__pyx_8), NULL); if (unlikely(!__pyx_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 193; __pyx_clineno = __LINE__; goto __pyx_L1;}
-Py_DECREF(__pyx_5); __pyx_5 = 0;
-Py_DECREF(((PyObject *)__pyx_8)); __pyx_8 = 0;
-if (PyObject_SetAttr(__pyx_m, __pyx_kp___version__, __pyx_6) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 193; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_1 = PyObject_Call(__pyx_6, ((PyObject *)__pyx_8), NULL); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 193; __pyx_clineno = __LINE__; goto __pyx_L1;}
 Py_DECREF(__pyx_6); __pyx_6 = 0;
+Py_DECREF(((PyObject *)__pyx_8)); __pyx_8 = 0;
+if (PyObject_SetAttr(__pyx_m, __pyx_kp___version__, __pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 193; __pyx_clineno = __LINE__; goto __pyx_L1;}
+Py_DECREF(__pyx_1); __pyx_1 = 0;
 
 /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/lxml.etree.pyx":410
  * 
@@ -120045,10 +120025,10 @@
  * 
  * cdef extern from "etree_defs.h":
  */
-__pyx_1 = __pyx_f_4lxml_5etree___initPrefixCache(); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 410; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_3 = __pyx_f_4lxml_5etree___initPrefixCache(); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 410; __pyx_clineno = __LINE__; goto __pyx_L1;}
 Py_DECREF(__pyx_v_4lxml_5etree__PREFIX_CACHE);
-__pyx_v_4lxml_5etree__PREFIX_CACHE = __pyx_1;
-__pyx_1 = 0;
+__pyx_v_4lxml_5etree__PREFIX_CACHE = __pyx_3;
+__pyx_3 = 0;
 
 /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/lxml.etree.pyx":2293
  *     return _elementFactory(doc, c_node)
@@ -120057,9 +120037,9 @@
  * 
  * cdef class CDATA:
  */
-__pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_67); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2293; __pyx_clineno = __LINE__; goto __pyx_L1;}
-if (PyObject_SetAttr(__pyx_m, __pyx_kp_PI, __pyx_4) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2293; __pyx_clineno = __LINE__; goto __pyx_L1;}
-Py_DECREF(__pyx_4); __pyx_4 = 0;
+__pyx_5 = __Pyx_GetName(__pyx_m, __pyx_kp_67); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2293; __pyx_clineno = __LINE__; goto __pyx_L1;}
+if (PyObject_SetAttr(__pyx_m, __pyx_kp_PI, __pyx_5) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2293; __pyx_clineno = __LINE__; goto __pyx_L1;}
+Py_DECREF(__pyx_5); __pyx_5 = 0;
 
 /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/apihelpers.pxi":486
  * 
@@ -120068,7 +120048,7 @@
  *     ur'^(\s*<\?\s*xml[^>]+)\s+encoding\s*=\s*"[^"]*"\s*', re.U)
  * 
  */
-__pyx_3 = PyObject_GetAttr(__pyx_v_4lxml_5etree_re, __pyx_kp_compile); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 486; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_4 = PyObject_GetAttr(__pyx_v_4lxml_5etree_re, __pyx_kp_compile); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 486; __pyx_clineno = __LINE__; goto __pyx_L1;}
 
 /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/apihelpers.pxi":487
  * cdef object __RE_XML_ENCODING
@@ -120077,18 +120057,18 @@
  * 
  * cdef object __REPLACE_XML_ENCODING
  */
-__pyx_5 = PyObject_GetAttr(__pyx_v_4lxml_5etree_re, __pyx_kp_U); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 487; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_6 = PyObject_GetAttr(__pyx_v_4lxml_5etree_re, __pyx_kp_U); if (unlikely(!__pyx_6)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 487; __pyx_clineno = __LINE__; goto __pyx_L1;}
 __pyx_8 = PyTuple_New(2); if (unlikely(!__pyx_8)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 486; __pyx_clineno = __LINE__; goto __pyx_L1;}
 Py_INCREF(__pyx_kp_70);
 PyTuple_SET_ITEM(__pyx_8, 0, __pyx_kp_70);
-PyTuple_SET_ITEM(__pyx_8, 1, __pyx_5);
-__pyx_5 = 0;
-__pyx_6 = PyObject_Call(__pyx_3, ((PyObject *)__pyx_8), NULL); if (unlikely(!__pyx_6)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 486; __pyx_clineno = __LINE__; goto __pyx_L1;}
-Py_DECREF(__pyx_3); __pyx_3 = 0;
+PyTuple_SET_ITEM(__pyx_8, 1, __pyx_6);
+__pyx_6 = 0;
+__pyx_1 = PyObject_Call(__pyx_4, ((PyObject *)__pyx_8), NULL); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 486; __pyx_clineno = __LINE__; goto __pyx_L1;}
+Py_DECREF(__pyx_4); __pyx_4 = 0;
 Py_DECREF(((PyObject *)__pyx_8)); __pyx_8 = 0;
 Py_DECREF(__pyx_v_4lxml_5etree___RE_XML_ENCODING);
-__pyx_v_4lxml_5etree___RE_XML_ENCODING = __pyx_6;
-__pyx_6 = 0;
+__pyx_v_4lxml_5etree___RE_XML_ENCODING = __pyx_1;
+__pyx_1 = 0;
 
 /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/apihelpers.pxi":490
  * 
@@ -120097,10 +120077,10 @@
  * 
  * cdef object __HAS_XML_ENCODING
  */
-__pyx_1 = PyObject_GetAttr(__pyx_v_4lxml_5etree___RE_XML_ENCODING, __pyx_kp_sub); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 490; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_3 = PyObject_GetAttr(__pyx_v_4lxml_5etree___RE_XML_ENCODING, __pyx_kp_sub); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 490; __pyx_clineno = __LINE__; goto __pyx_L1;}
 Py_DECREF(__pyx_v_4lxml_5etree___REPLACE_XML_ENCODING);
-__pyx_v_4lxml_5etree___REPLACE_XML_ENCODING = __pyx_1;
-__pyx_1 = 0;
+__pyx_v_4lxml_5etree___REPLACE_XML_ENCODING = __pyx_3;
+__pyx_3 = 0;
 
 /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/apihelpers.pxi":493
  * 
@@ -120109,10 +120089,10 @@
  * 
  * cdef object _stripEncodingDeclaration(object xml_string):
  */
-__pyx_4 = PyObject_GetAttr(__pyx_v_4lxml_5etree___RE_XML_ENCODING, __pyx_kp_match); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 493; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_5 = PyObject_GetAttr(__pyx_v_4lxml_5etree___RE_XML_ENCODING, __pyx_kp_match); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 493; __pyx_clineno = __LINE__; goto __pyx_L1;}
 Py_DECREF(__pyx_v_4lxml_5etree___HAS_XML_ENCODING);
-__pyx_v_4lxml_5etree___HAS_XML_ENCODING = __pyx_4;
-__pyx_4 = 0;
+__pyx_v_4lxml_5etree___HAS_XML_ENCODING = __pyx_5;
+__pyx_5 = 0;
 
 /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/xmlerror.pxi":400
  * # global list log to collect error output messages from libxml2/libxslt
@@ -120121,15 +120101,15 @@
  * 
  * cdef __copyGlobalErrorLog():
  */
-__pyx_5 = PyTuple_New(1); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 400; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_6 = PyTuple_New(1); if (unlikely(!__pyx_6)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 400; __pyx_clineno = __LINE__; goto __pyx_L1;}
 Py_INCREF(__pyx_int_100);
-PyTuple_SET_ITEM(__pyx_5, 0, __pyx_int_100);
-__pyx_3 = PyObject_Call(((PyObject*)__pyx_ptype_4lxml_5etree__RotatingErrorLog), ((PyObject *)__pyx_5), NULL); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 400; __pyx_clineno = __LINE__; goto __pyx_L1;}
-Py_DECREF(((PyObject *)__pyx_5)); __pyx_5 = 0;
-if (!(__Pyx_TypeTest(__pyx_3, __pyx_ptype_4lxml_5etree__BaseErrorLog))) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 400; __pyx_clineno = __LINE__; goto __pyx_L1;}
+PyTuple_SET_ITEM(__pyx_6, 0, __pyx_int_100);
+__pyx_4 = PyObject_Call(((PyObject*)__pyx_ptype_4lxml_5etree__RotatingErrorLog), ((PyObject *)__pyx_6), NULL); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 400; __pyx_clineno = __LINE__; goto __pyx_L1;}
+Py_DECREF(((PyObject *)__pyx_6)); __pyx_6 = 0;
+if (!(__Pyx_TypeTest(__pyx_4, __pyx_ptype_4lxml_5etree__BaseErrorLog))) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 400; __pyx_clineno = __LINE__; goto __pyx_L1;}
 Py_DECREF(((PyObject *)__pyx_v_4lxml_5etree___GLOBAL_ERROR_LOG));
-__pyx_v_4lxml_5etree___GLOBAL_ERROR_LOG = ((struct __pyx_obj_4lxml_5etree__BaseErrorLog *)__pyx_3);
-__pyx_3 = 0;
+__pyx_v_4lxml_5etree___GLOBAL_ERROR_LOG = ((struct __pyx_obj_4lxml_5etree__BaseErrorLog *)__pyx_4);
+__pyx_4 = 0;
 
 /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/xmlerror.pxi":527
  * 
@@ -120140,9 +120120,9 @@
  */
 __pyx_8 = PyDict_New(); if (unlikely(!__pyx_8)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 527; __pyx_clineno = __LINE__; goto __pyx_L1;}
 if (PyDict_SetItemString(((PyObject *)__pyx_8), "__doc__", __pyx_kp_71) < 0) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 527; __pyx_clineno = __LINE__; goto __pyx_L1;}
-__pyx_6 = __Pyx_CreateClass(((PyObject *)__pyx_empty_tuple), ((PyObject *)__pyx_8), __pyx_kp_ErrorLevels, "lxml.etree"); if (unlikely(!__pyx_6)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 527; __pyx_clineno = __LINE__; goto __pyx_L1;}
-if (PyObject_SetAttr(__pyx_m, __pyx_kp_ErrorLevels, __pyx_6) < 0) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 527; __pyx_clineno = __LINE__; goto __pyx_L1;}
-Py_DECREF(__pyx_6); __pyx_6 = 0;
+__pyx_1 = __Pyx_CreateClass(((PyObject *)__pyx_empty_tuple), ((PyObject *)__pyx_8), __pyx_kp_ErrorLevels, "lxml.etree"); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 527; __pyx_clineno = __LINE__; goto __pyx_L1;}
+if (PyObject_SetAttr(__pyx_m, __pyx_kp_ErrorLevels, __pyx_1) < 0) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 527; __pyx_clineno = __LINE__; goto __pyx_L1;}
+Py_DECREF(__pyx_1); __pyx_1 = 0;
 Py_DECREF(((PyObject *)__pyx_8)); __pyx_8 = 0;
 
 /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/xmlerror.pxi":530
@@ -120152,12 +120132,12 @@
  *     u"Libxml2 error domains"
  * 
  */
-__pyx_1 = PyDict_New(); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 530; __pyx_clineno = __LINE__; goto __pyx_L1;}
-if (PyDict_SetItemString(((PyObject *)__pyx_1), "__doc__", __pyx_kp_72) < 0) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 530; __pyx_clineno = __LINE__; goto __pyx_L1;}
-__pyx_4 = __Pyx_CreateClass(((PyObject *)__pyx_empty_tuple), ((PyObject *)__pyx_1), __pyx_kp_ErrorDomains, "lxml.etree"); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 530; __pyx_clineno = __LINE__; goto __pyx_L1;}
-if (PyObject_SetAttr(__pyx_m, __pyx_kp_ErrorDomains, __pyx_4) < 0) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 530; __pyx_clineno = __LINE__; goto __pyx_L1;}
-Py_DECREF(__pyx_4); __pyx_4 = 0;
-Py_DECREF(((PyObject *)__pyx_1)); __pyx_1 = 0;
+__pyx_3 = PyDict_New(); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 530; __pyx_clineno = __LINE__; goto __pyx_L1;}
+if (PyDict_SetItemString(((PyObject *)__pyx_3), "__doc__", __pyx_kp_72) < 0) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 530; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_5 = __Pyx_CreateClass(((PyObject *)__pyx_empty_tuple), ((PyObject *)__pyx_3), __pyx_kp_ErrorDomains, "lxml.etree"); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 530; __pyx_clineno = __LINE__; goto __pyx_L1;}
+if (PyObject_SetAttr(__pyx_m, __pyx_kp_ErrorDomains, __pyx_5) < 0) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 530; __pyx_clineno = __LINE__; goto __pyx_L1;}
+Py_DECREF(__pyx_5); __pyx_5 = 0;
+Py_DECREF(((PyObject *)__pyx_3)); __pyx_3 = 0;
 
 /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/xmlerror.pxi":533
  *     u"Libxml2 error domains"
@@ -120166,12 +120146,12 @@
  *     u"Libxml2 error types"
  * 
  */
-__pyx_5 = PyDict_New(); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 533; __pyx_clineno = __LINE__; goto __pyx_L1;}
-if (PyDict_SetItemString(((PyObject *)__pyx_5), "__doc__", __pyx_kp_73) < 0) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 533; __pyx_clineno = __LINE__; goto __pyx_L1;}
-__pyx_3 = __Pyx_CreateClass(((PyObject *)__pyx_empty_tuple), ((PyObject *)__pyx_5), __pyx_kp_ErrorTypes, "lxml.etree"); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 533; __pyx_clineno = __LINE__; goto __pyx_L1;}
-if (PyObject_SetAttr(__pyx_m, __pyx_kp_ErrorTypes, __pyx_3) < 0) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 533; __pyx_clineno = __LINE__; goto __pyx_L1;}
-Py_DECREF(__pyx_3); __pyx_3 = 0;
-Py_DECREF(((PyObject *)__pyx_5)); __pyx_5 = 0;
+__pyx_6 = PyDict_New(); if (unlikely(!__pyx_6)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 533; __pyx_clineno = __LINE__; goto __pyx_L1;}
+if (PyDict_SetItemString(((PyObject *)__pyx_6), "__doc__", __pyx_kp_73) < 0) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 533; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_4 = __Pyx_CreateClass(((PyObject *)__pyx_empty_tuple), ((PyObject *)__pyx_6), __pyx_kp_ErrorTypes, "lxml.etree"); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 533; __pyx_clineno = __LINE__; goto __pyx_L1;}
+if (PyObject_SetAttr(__pyx_m, __pyx_kp_ErrorTypes, __pyx_4) < 0) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 533; __pyx_clineno = __LINE__; goto __pyx_L1;}
+Py_DECREF(__pyx_4); __pyx_4 = 0;
+Py_DECREF(((PyObject *)__pyx_6)); __pyx_6 = 0;
 
 /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/xmlerror.pxi":536
  *     u"Libxml2 error types"
@@ -120180,12 +120160,12 @@
  *     u"Libxml2 RelaxNG error types"
  * 
  */
-__pyx_6 = PyDict_New(); if (unlikely(!__pyx_6)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 536; __pyx_clineno = __LINE__; goto __pyx_L1;}
-if (PyDict_SetItemString(((PyObject *)__pyx_6), "__doc__", __pyx_kp_74) < 0) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 536; __pyx_clineno = __LINE__; goto __pyx_L1;}
-__pyx_8 = __Pyx_CreateClass(((PyObject *)__pyx_empty_tuple), ((PyObject *)__pyx_6), __pyx_kp_RelaxNGErrorTypes, "lxml.etree"); if (unlikely(!__pyx_8)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 536; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_1 = PyDict_New(); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 536; __pyx_clineno = __LINE__; goto __pyx_L1;}
+if (PyDict_SetItemString(((PyObject *)__pyx_1), "__doc__", __pyx_kp_74) < 0) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 536; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_8 = __Pyx_CreateClass(((PyObject *)__pyx_empty_tuple), ((PyObject *)__pyx_1), __pyx_kp_RelaxNGErrorTypes, "lxml.etree"); if (unlikely(!__pyx_8)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 536; __pyx_clineno = __LINE__; goto __pyx_L1;}
 if (PyObject_SetAttr(__pyx_m, __pyx_kp_RelaxNGErrorTypes, __pyx_8) < 0) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 536; __pyx_clineno = __LINE__; goto __pyx_L1;}
 Py_DECREF(__pyx_8); __pyx_8 = 0;
-Py_DECREF(((PyObject *)__pyx_6)); __pyx_6 = 0;
+Py_DECREF(((PyObject *)__pyx_1)); __pyx_1 = 0;
 
 /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/xmlerror.pxi":550
  * 
@@ -120194,12 +120174,12 @@
  * NONE=0
  * WARNING=1
  */
-__pyx_4 = PyTuple_New(1); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 550; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_5 = PyTuple_New(1); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 550; __pyx_clineno = __LINE__; goto __pyx_L1;}
 Py_INCREF(__pyx_kp_75);
-PyTuple_SET_ITEM(__pyx_4, 0, __pyx_kp_75);
+PyTuple_SET_ITEM(__pyx_5, 0, __pyx_kp_75);
 Py_DECREF(__pyx_v_4lxml_5etree___ERROR_LEVELS);
-__pyx_v_4lxml_5etree___ERROR_LEVELS = ((PyObject *)__pyx_4);
-__pyx_4 = 0;
+__pyx_v_4lxml_5etree___ERROR_LEVELS = ((PyObject *)__pyx_5);
+__pyx_5 = 0;
 
 /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/xmlerror.pxi":558
  * 
@@ -120208,12 +120188,12 @@
  * NONE=0
  * PARSER=1
  */
-__pyx_1 = PyTuple_New(1); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 558; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_3 = PyTuple_New(1); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 558; __pyx_clineno = __LINE__; goto __pyx_L1;}
 Py_INCREF(__pyx_kp_76);
-PyTuple_SET_ITEM(__pyx_1, 0, __pyx_kp_76);
+PyTuple_SET_ITEM(__pyx_3, 0, __pyx_kp_76);
 Py_DECREF(__pyx_v_4lxml_5etree___ERROR_DOMAINS);
-__pyx_v_4lxml_5etree___ERROR_DOMAINS = ((PyObject *)__pyx_1);
-__pyx_1 = 0;
+__pyx_v_4lxml_5etree___ERROR_DOMAINS = ((PyObject *)__pyx_3);
+__pyx_3 = 0;
 
 /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/xmlerror.pxi":1262
  * SCHEMAP_SRC_IMPORT_1_1=3064
@@ -120222,30 +120202,30 @@
  * SCHEMAP_SRC_IMPORT_1_2=3065
  * SCHEMAP_SRC_IMPORT_2=3066
  */
-__pyx_3 = PyTuple_New(10); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 591; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_4 = PyTuple_New(10); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 591; __pyx_clineno = __LINE__; goto __pyx_L1;}
 Py_INCREF(__pyx_kp_77);
-PyTuple_SET_ITEM(__pyx_3, 0, __pyx_kp_77);
+PyTuple_SET_ITEM(__pyx_4, 0, __pyx_kp_77);
 Py_INCREF(__pyx_kp_78);
-PyTuple_SET_ITEM(__pyx_3, 1, __pyx_kp_78);
+PyTuple_SET_ITEM(__pyx_4, 1, __pyx_kp_78);
 Py_INCREF(__pyx_kp_79);
-PyTuple_SET_ITEM(__pyx_3, 2, __pyx_kp_79);
+PyTuple_SET_ITEM(__pyx_4, 2, __pyx_kp_79);
 Py_INCREF(__pyx_kp_80);
-PyTuple_SET_ITEM(__pyx_3, 3, __pyx_kp_80);
+PyTuple_SET_ITEM(__pyx_4, 3, __pyx_kp_80);
 Py_INCREF(__pyx_kp_81);
-PyTuple_SET_ITEM(__pyx_3, 4, __pyx_kp_81);
+PyTuple_SET_ITEM(__pyx_4, 4, __pyx_kp_81);
 Py_INCREF(__pyx_kp_82);
-PyTuple_SET_ITEM(__pyx_3, 5, __pyx_kp_82);
+PyTuple_SET_ITEM(__pyx_4, 5, __pyx_kp_82);
 Py_INCREF(__pyx_kp_83);
-PyTuple_SET_ITEM(__pyx_3, 6, __pyx_kp_83);
+PyTuple_SET_ITEM(__pyx_4, 6, __pyx_kp_83);
 Py_INCREF(__pyx_kp_84);
-PyTuple_SET_ITEM(__pyx_3, 7, __pyx_kp_84);
+PyTuple_SET_ITEM(__pyx_4, 7, __pyx_kp_84);
 Py_INCREF(__pyx_kp_85);
-PyTuple_SET_ITEM(__pyx_3, 8, __pyx_kp_85);
+PyTuple_SET_ITEM(__pyx_4, 8, __pyx_kp_85);
 Py_INCREF(__pyx_kp_86);
-PyTuple_SET_ITEM(__pyx_3, 9, __pyx_kp_86);
+PyTuple_SET_ITEM(__pyx_4, 9, __pyx_kp_86);
 Py_DECREF(__pyx_v_4lxml_5etree___PARSER_ERROR_TYPES);
-__pyx_v_4lxml_5etree___PARSER_ERROR_TYPES = ((PyObject *)__pyx_3);
-__pyx_3 = 0;
+__pyx_v_4lxml_5etree___PARSER_ERROR_TYPES = ((PyObject *)__pyx_4);
+__pyx_4 = 0;
 
 /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/xmlerror.pxi":1342
  * 
@@ -120254,12 +120234,12 @@
  * RELAXNG_OK=0
  * RELAXNG_ERR_MEMORY=1
  */
-__pyx_5 = PyTuple_New(1); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 1342; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_6 = PyTuple_New(1); if (unlikely(!__pyx_6)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 1342; __pyx_clineno = __LINE__; goto __pyx_L1;}
 Py_INCREF(__pyx_kp_87);
-PyTuple_SET_ITEM(__pyx_5, 0, __pyx_kp_87);
+PyTuple_SET_ITEM(__pyx_6, 0, __pyx_kp_87);
 Py_DECREF(__pyx_v_4lxml_5etree___RELAXNG_ERROR_TYPES);
-__pyx_v_4lxml_5etree___RELAXNG_ERROR_TYPES = ((PyObject *)__pyx_5);
-__pyx_5 = 0;
+__pyx_v_4lxml_5etree___RELAXNG_ERROR_TYPES = ((PyObject *)__pyx_6);
+__pyx_6 = 0;
 
 /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/xmlerror.pxi":1386
  * # --- END: GENERATED CONSTANTS ---
@@ -120286,14 +120266,14 @@
  * 
  * set_element_class_lookup(DEFAULT_ELEMENT_CLASS_LOOKUP)             # <<<<<<<<<<<<<<
  */
-__pyx_6 = __Pyx_GetName(__pyx_m, __pyx_kp_28); if (unlikely(!__pyx_6)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 423; __pyx_clineno = __LINE__; goto __pyx_L1;}
-__pyx_4 = PyTuple_New(1); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 423; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_28); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 423; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_5 = PyTuple_New(1); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 423; __pyx_clineno = __LINE__; goto __pyx_L1;}
 Py_INCREF(((PyObject *)__pyx_v_4lxml_5etree_DEFAULT_ELEMENT_CLASS_LOOKUP));
-PyTuple_SET_ITEM(__pyx_4, 0, ((PyObject *)__pyx_v_4lxml_5etree_DEFAULT_ELEMENT_CLASS_LOOKUP));
-__pyx_1 = PyObject_Call(__pyx_6, ((PyObject *)__pyx_4), NULL); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 423; __pyx_clineno = __LINE__; goto __pyx_L1;}
-Py_DECREF(__pyx_6); __pyx_6 = 0;
-Py_DECREF(((PyObject *)__pyx_4)); __pyx_4 = 0;
+PyTuple_SET_ITEM(__pyx_5, 0, ((PyObject *)__pyx_v_4lxml_5etree_DEFAULT_ELEMENT_CLASS_LOOKUP));
+__pyx_3 = PyObject_Call(__pyx_1, ((PyObject *)__pyx_5), NULL); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 423; __pyx_clineno = __LINE__; goto __pyx_L1;}
 Py_DECREF(__pyx_1); __pyx_1 = 0;
+Py_DECREF(((PyObject *)__pyx_5)); __pyx_5 = 0;
+Py_DECREF(__pyx_3); __pyx_3 = 0;
 
 /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/nsclasses.pxi":3
  * # module-level API for namespace implementations
@@ -120302,17 +120282,17 @@
  *     u"""Base class of lxml registry errors.
  *     """
  */
-__pyx_3 = PyDict_New(); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1;}
-__pyx_5 = __Pyx_GetName(__pyx_m, __pyx_kp_LxmlError); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_4 = PyDict_New(); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_6 = __Pyx_GetName(__pyx_m, __pyx_kp_LxmlError); if (unlikely(!__pyx_6)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1;}
 __pyx_8 = PyTuple_New(1); if (unlikely(!__pyx_8)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1;}
-PyTuple_SET_ITEM(__pyx_8, 0, __pyx_5);
-__pyx_5 = 0;
-if (PyDict_SetItemString(((PyObject *)__pyx_3), "__doc__", __pyx_kp_88) < 0) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1;}
-__pyx_6 = __Pyx_CreateClass(((PyObject *)__pyx_8), ((PyObject *)__pyx_3), __pyx_kp_LxmlRegistryError, "lxml.etree"); if (unlikely(!__pyx_6)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1;}
+PyTuple_SET_ITEM(__pyx_8, 0, __pyx_6);
+__pyx_6 = 0;
+if (PyDict_SetItemString(((PyObject *)__pyx_4), "__doc__", __pyx_kp_88) < 0) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_1 = __Pyx_CreateClass(((PyObject *)__pyx_8), ((PyObject *)__pyx_4), __pyx_kp_LxmlRegistryError, "lxml.etree"); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1;}
 Py_DECREF(((PyObject *)__pyx_8)); __pyx_8 = 0;
-if (PyObject_SetAttr(__pyx_m, __pyx_kp_LxmlRegistryError, __pyx_6) < 0) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1;}
-Py_DECREF(__pyx_6); __pyx_6 = 0;
-Py_DECREF(((PyObject *)__pyx_3)); __pyx_3 = 0;
+if (PyObject_SetAttr(__pyx_m, __pyx_kp_LxmlRegistryError, __pyx_1) < 0) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1;}
+Py_DECREF(__pyx_1); __pyx_1 = 0;
+Py_DECREF(((PyObject *)__pyx_4)); __pyx_4 = 0;
 
 /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/nsclasses.pxi":8
  *     pass
@@ -120321,17 +120301,17 @@
  *     u"""Error registering a namespace extension.
  *     """
  */
-__pyx_4 = PyDict_New(); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 8; __pyx_clineno = __LINE__; goto __pyx_L1;}
-__pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_LxmlRegistryError); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 8; __pyx_clineno = __LINE__; goto __pyx_L1;}
-__pyx_5 = PyTuple_New(1); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 8; __pyx_clineno = __LINE__; goto __pyx_L1;}
-PyTuple_SET_ITEM(__pyx_5, 0, __pyx_1);
-__pyx_1 = 0;
-if (PyDict_SetItemString(((PyObject *)__pyx_4), "__doc__", __pyx_kp_90) < 0) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 8; __pyx_clineno = __LINE__; goto __pyx_L1;}
-__pyx_8 = __Pyx_CreateClass(((PyObject *)__pyx_5), ((PyObject *)__pyx_4), __pyx_kp_89, "lxml.etree"); if (unlikely(!__pyx_8)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 8; __pyx_clineno = __LINE__; goto __pyx_L1;}
-Py_DECREF(((PyObject *)__pyx_5)); __pyx_5 = 0;
+__pyx_5 = PyDict_New(); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 8; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_LxmlRegistryError); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 8; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_6 = PyTuple_New(1); if (unlikely(!__pyx_6)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 8; __pyx_clineno = __LINE__; goto __pyx_L1;}
+PyTuple_SET_ITEM(__pyx_6, 0, __pyx_3);
+__pyx_3 = 0;
+if (PyDict_SetItemString(((PyObject *)__pyx_5), "__doc__", __pyx_kp_90) < 0) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 8; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_8 = __Pyx_CreateClass(((PyObject *)__pyx_6), ((PyObject *)__pyx_5), __pyx_kp_89, "lxml.etree"); if (unlikely(!__pyx_8)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 8; __pyx_clineno = __LINE__; goto __pyx_L1;}
+Py_DECREF(((PyObject *)__pyx_6)); __pyx_6 = 0;
 if (PyObject_SetAttr(__pyx_m, __pyx_kp_89, __pyx_8) < 0) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 8; __pyx_clineno = __LINE__; goto __pyx_L1;}
 Py_DECREF(__pyx_8); __pyx_8 = 0;
-Py_DECREF(((PyObject *)__pyx_4)); __pyx_4 = 0;
+Py_DECREF(((PyObject *)__pyx_5)); __pyx_5 = 0;
 
 /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/nsclasses.pxi":165
  * 
@@ -120340,10 +120320,10 @@
  * 
  * def FunctionNamespace(ns_uri):
  */
-__pyx_6 = PyDict_New(); if (unlikely(!__pyx_6)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 165; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_1 = PyDict_New(); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 165; __pyx_clineno = __LINE__; goto __pyx_L1;}
 Py_DECREF(__pyx_v_4lxml_5etree___FUNCTION_NAMESPACE_REGISTRIES);
-__pyx_v_4lxml_5etree___FUNCTION_NAMESPACE_REGISTRIES = ((PyObject *)__pyx_6);
-__pyx_6 = 0;
+__pyx_v_4lxml_5etree___FUNCTION_NAMESPACE_REGISTRIES = ((PyObject *)__pyx_1);
+__pyx_1 = 0;
 
 /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/parser.pxi":13
  * cdef class XMLSchema(_Validator)
@@ -120352,17 +120332,17 @@
  *     u"""Syntax error while parsing an XML document.
  * 
  */
-__pyx_3 = PyDict_New(); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 13; __pyx_clineno = __LINE__; goto __pyx_L1;}
-__pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_LxmlSyntaxError); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 13; __pyx_clineno = __LINE__; goto __pyx_L1;}
-__pyx_5 = PyTuple_New(1); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 13; __pyx_clineno = __LINE__; goto __pyx_L1;}
-PyTuple_SET_ITEM(__pyx_5, 0, __pyx_1);
-__pyx_1 = 0;
-if (PyDict_SetItemString(((PyObject *)__pyx_3), "__doc__", __pyx_kp_91) < 0) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 13; __pyx_clineno = __LINE__; goto __pyx_L1;}
-__pyx_8 = __Pyx_CreateClass(((PyObject *)__pyx_5), ((PyObject *)__pyx_3), __pyx_kp_ParseError, "lxml.etree"); if (unlikely(!__pyx_8)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 13; __pyx_clineno = __LINE__; goto __pyx_L1;}
-Py_DECREF(((PyObject *)__pyx_5)); __pyx_5 = 0;
+__pyx_4 = PyDict_New(); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 13; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_LxmlSyntaxError); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 13; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_6 = PyTuple_New(1); if (unlikely(!__pyx_6)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 13; __pyx_clineno = __LINE__; goto __pyx_L1;}
+PyTuple_SET_ITEM(__pyx_6, 0, __pyx_3);
+__pyx_3 = 0;
+if (PyDict_SetItemString(((PyObject *)__pyx_4), "__doc__", __pyx_kp_91) < 0) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 13; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_8 = __Pyx_CreateClass(((PyObject *)__pyx_6), ((PyObject *)__pyx_4), __pyx_kp_ParseError, "lxml.etree"); if (unlikely(!__pyx_8)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 13; __pyx_clineno = __LINE__; goto __pyx_L1;}
+Py_DECREF(((PyObject *)__pyx_6)); __pyx_6 = 0;
 if (PyObject_SetAttr(__pyx_m, __pyx_kp_ParseError, __pyx_8) < 0) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 13; __pyx_clineno = __LINE__; goto __pyx_L1;}
 Py_DECREF(__pyx_8); __pyx_8 = 0;
-Py_DECREF(((PyObject *)__pyx_3)); __pyx_3 = 0;
+Py_DECREF(((PyObject *)__pyx_4)); __pyx_4 = 0;
 
 /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/parser.pxi":20
  *     pass
@@ -120371,14 +120351,14 @@
  *     u"""Syntax error while parsing an XML document.
  *     """
  */
-__pyx_4 = PyDict_New(); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 20; __pyx_clineno = __LINE__; goto __pyx_L1;}
-__pyx_6 = __Pyx_GetName(__pyx_m, __pyx_kp_ParseError); if (unlikely(!__pyx_6)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 20; __pyx_clineno = __LINE__; goto __pyx_L1;}
-__pyx_1 = PyTuple_New(1); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 20; __pyx_clineno = __LINE__; goto __pyx_L1;}
-PyTuple_SET_ITEM(__pyx_1, 0, __pyx_6);
-__pyx_6 = 0;
-if (PyDict_SetItemString(((PyObject *)__pyx_4), "__doc__", __pyx_kp_92) < 0) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 20; __pyx_clineno = __LINE__; goto __pyx_L1;}
-__pyx_5 = __Pyx_CreateClass(((PyObject *)__pyx_1), ((PyObject *)__pyx_4), __pyx_kp_XMLSyntaxError, "lxml.etree"); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 20; __pyx_clineno = __LINE__; goto __pyx_L1;}
-Py_DECREF(((PyObject *)__pyx_1)); __pyx_1 = 0;
+__pyx_5 = PyDict_New(); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 20; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_ParseError); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 20; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_3 = PyTuple_New(1); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 20; __pyx_clineno = __LINE__; goto __pyx_L1;}
+PyTuple_SET_ITEM(__pyx_3, 0, __pyx_1);
+__pyx_1 = 0;
+if (PyDict_SetItemString(((PyObject *)__pyx_5), "__doc__", __pyx_kp_92) < 0) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 20; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_6 = __Pyx_CreateClass(((PyObject *)__pyx_3), ((PyObject *)__pyx_5), __pyx_kp_XMLSyntaxError, "lxml.etree"); if (unlikely(!__pyx_6)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 20; __pyx_clineno = __LINE__; goto __pyx_L1;}
+Py_DECREF(((PyObject *)__pyx_3)); __pyx_3 = 0;
 
 /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/parser.pxi":23
  *     u"""Syntax error while parsing an XML document.
@@ -120388,13 +120368,13 @@
  *             # Python >= 2.5 uses new style class exceptions
  */
 __pyx_8 = PyCFunction_New(&__pyx_mdef_4lxml_5etree_14XMLSyntaxError___init__, 0); if (unlikely(!__pyx_8)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 23; __pyx_clineno = __LINE__; goto __pyx_L1;}
-__pyx_3 = PyMethod_New(__pyx_8, 0, __pyx_5); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 23; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_4 = PyMethod_New(__pyx_8, 0, __pyx_6); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 23; __pyx_clineno = __LINE__; goto __pyx_L1;}
 Py_DECREF(__pyx_8); __pyx_8 = 0;
-if (PyObject_SetAttr(__pyx_5, __pyx_kp___init__, __pyx_3) < 0) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 23; __pyx_clineno = __LINE__; goto __pyx_L1;}
-Py_DECREF(__pyx_3); __pyx_3 = 0;
-if (PyObject_SetAttr(__pyx_m, __pyx_kp_XMLSyntaxError, __pyx_5) < 0) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 20; __pyx_clineno = __LINE__; goto __pyx_L1;}
-Py_DECREF(__pyx_5); __pyx_5 = 0;
-Py_DECREF(((PyObject *)__pyx_4)); __pyx_4 = 0;
+if (PyObject_SetAttr(__pyx_6, __pyx_kp___init__, __pyx_4) < 0) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 23; __pyx_clineno = __LINE__; goto __pyx_L1;}
+Py_DECREF(__pyx_4); __pyx_4 = 0;
+if (PyObject_SetAttr(__pyx_m, __pyx_kp_XMLSyntaxError, __pyx_6) < 0) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 20; __pyx_clineno = __LINE__; goto __pyx_L1;}
+Py_DECREF(__pyx_6); __pyx_6 = 0;
+Py_DECREF(((PyObject *)__pyx_5)); __pyx_5 = 0;
 
 /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/parser.pxi":33
  * 
@@ -120403,10 +120383,10 @@
  * 
  * class ParserError(LxmlError):
  */
-__pyx_6 = __Pyx_GetName(__pyx_m, __pyx_kp_XMLSyntaxError); if (unlikely(!__pyx_6)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_XMLSyntaxError); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1;}
 Py_DECREF(__pyx_v_4lxml_5etree__XMLSyntaxError);
-__pyx_v_4lxml_5etree__XMLSyntaxError = __pyx_6;
-__pyx_6 = 0;
+__pyx_v_4lxml_5etree__XMLSyntaxError = __pyx_1;
+__pyx_1 = 0;
 
 /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/parser.pxi":35
  * _XMLSyntaxError = XMLSyntaxError
@@ -120415,17 +120395,17 @@
  *     u"""Internal lxml parser error.
  *     """
  */
-__pyx_1 = PyDict_New(); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 35; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_3 = PyDict_New(); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 35; __pyx_clineno = __LINE__; goto __pyx_L1;}
 __pyx_8 = __Pyx_GetName(__pyx_m, __pyx_kp_LxmlError); if (unlikely(!__pyx_8)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 35; __pyx_clineno = __LINE__; goto __pyx_L1;}
-__pyx_3 = PyTuple_New(1); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 35; __pyx_clineno = __LINE__; goto __pyx_L1;}
-PyTuple_SET_ITEM(__pyx_3, 0, __pyx_8);
+__pyx_4 = PyTuple_New(1); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 35; __pyx_clineno = __LINE__; goto __pyx_L1;}
+PyTuple_SET_ITEM(__pyx_4, 0, __pyx_8);
 __pyx_8 = 0;
-if (PyDict_SetItemString(((PyObject *)__pyx_1), "__doc__", __pyx_kp_93) < 0) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 35; __pyx_clineno = __LINE__; goto __pyx_L1;}
-__pyx_5 = __Pyx_CreateClass(((PyObject *)__pyx_3), ((PyObject *)__pyx_1), __pyx_kp_ParserError, "lxml.etree"); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 35; __pyx_clineno = __LINE__; goto __pyx_L1;}
+if (PyDict_SetItemString(((PyObject *)__pyx_3), "__doc__", __pyx_kp_93) < 0) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 35; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_6 = __Pyx_CreateClass(((PyObject *)__pyx_4), ((PyObject *)__pyx_3), __pyx_kp_ParserError, "lxml.etree"); if (unlikely(!__pyx_6)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 35; __pyx_clineno = __LINE__; goto __pyx_L1;}
+Py_DECREF(((PyObject *)__pyx_4)); __pyx_4 = 0;
+if (PyObject_SetAttr(__pyx_m, __pyx_kp_ParserError, __pyx_6) < 0) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 35; __pyx_clineno = __LINE__; goto __pyx_L1;}
+Py_DECREF(__pyx_6); __pyx_6 = 0;
 Py_DECREF(((PyObject *)__pyx_3)); __pyx_3 = 0;
-if (PyObject_SetAttr(__pyx_m, __pyx_kp_ParserError, __pyx_5) < 0) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 35; __pyx_clineno = __LINE__; goto __pyx_L1;}
-Py_DECREF(__pyx_5); __pyx_5 = 0;
-Py_DECREF(((PyObject *)__pyx_1)); __pyx_1 = 0;
 
 /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/parser.pxi":186
  * 
@@ -120434,11 +120414,11 @@
  * __GLOBAL_PARSER_CONTEXT.initMainParserContext()
  * 
  */
-__pyx_4 = PyObject_Call(((PyObject*)__pyx_ptype_4lxml_5etree__ParserDictionaryContext), ((PyObject *)__pyx_empty_tuple), NULL); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 186; __pyx_clineno = __LINE__; goto __pyx_L1;}
-if (!(__Pyx_TypeTest(__pyx_4, __pyx_ptype_4lxml_5etree__ParserDictionaryContext))) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 186; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_5 = PyObject_Call(((PyObject*)__pyx_ptype_4lxml_5etree__ParserDictionaryContext), ((PyObject *)__pyx_empty_tuple), NULL); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 186; __pyx_clineno = __LINE__; goto __pyx_L1;}
+if (!(__Pyx_TypeTest(__pyx_5, __pyx_ptype_4lxml_5etree__ParserDictionaryContext))) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 186; __pyx_clineno = __LINE__; goto __pyx_L1;}
 Py_DECREF(((PyObject *)__pyx_v_4lxml_5etree___GLOBAL_PARSER_CONTEXT));
-__pyx_v_4lxml_5etree___GLOBAL_PARSER_CONTEXT = ((struct __pyx_obj_4lxml_5etree__ParserDictionaryContext *)__pyx_4);
-__pyx_4 = 0;
+__pyx_v_4lxml_5etree___GLOBAL_PARSER_CONTEXT = ((struct __pyx_obj_4lxml_5etree__ParserDictionaryContext *)__pyx_5);
+__pyx_5 = 0;
 
 /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/parser.pxi":187
  * cdef _ParserDictionaryContext __GLOBAL_PARSER_CONTEXT
@@ -120501,11 +120481,11 @@
  * 
  * __GLOBAL_PARSER_CONTEXT.setDefaultParser(__DEFAULT_XML_PARSER)
  */
-__pyx_6 = PyObject_Call(((PyObject*)__pyx_ptype_4lxml_5etree_XMLParser), ((PyObject *)__pyx_empty_tuple), NULL); if (unlikely(!__pyx_6)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 1278; __pyx_clineno = __LINE__; goto __pyx_L1;}
-if (!(__Pyx_TypeTest(__pyx_6, __pyx_ptype_4lxml_5etree_XMLParser))) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 1278; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_1 = PyObject_Call(((PyObject*)__pyx_ptype_4lxml_5etree_XMLParser), ((PyObject *)__pyx_empty_tuple), NULL); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 1278; __pyx_clineno = __LINE__; goto __pyx_L1;}
+if (!(__Pyx_TypeTest(__pyx_1, __pyx_ptype_4lxml_5etree_XMLParser))) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 1278; __pyx_clineno = __LINE__; goto __pyx_L1;}
 Py_DECREF(((PyObject *)__pyx_v_4lxml_5etree___DEFAULT_XML_PARSER));
-__pyx_v_4lxml_5etree___DEFAULT_XML_PARSER = ((struct __pyx_obj_4lxml_5etree_XMLParser *)__pyx_6);
-__pyx_6 = 0;
+__pyx_v_4lxml_5etree___DEFAULT_XML_PARSER = ((struct __pyx_obj_4lxml_5etree_XMLParser *)__pyx_1);
+__pyx_1 = 0;
 
 /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/parser.pxi":1280
  * __DEFAULT_XML_PARSER = XMLParser()
@@ -120545,16 +120525,16 @@
  * 
  * class _TargetParserResult(Exception):
  */
-__pyx_3 = PyList_New(1); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 4; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_4 = PyList_New(1); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 4; __pyx_clineno = __LINE__; goto __pyx_L1;}
 Py_INCREF(__pyx_kp_getargspec);
-PyList_SET_ITEM(__pyx_3, 0, __pyx_kp_getargspec);
-__pyx_5 = __Pyx_Import(__pyx_kp_inspect, ((PyObject *)__pyx_3)); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 4; __pyx_clineno = __LINE__; goto __pyx_L1;}
-Py_DECREF(((PyObject *)__pyx_3)); __pyx_3 = 0;
-__pyx_1 = PyObject_GetAttr(__pyx_5, __pyx_kp_getargspec); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 4; __pyx_clineno = __LINE__; goto __pyx_L1;}
+PyList_SET_ITEM(__pyx_4, 0, __pyx_kp_getargspec);
+__pyx_6 = __Pyx_Import(__pyx_kp_inspect, ((PyObject *)__pyx_4)); if (unlikely(!__pyx_6)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 4; __pyx_clineno = __LINE__; goto __pyx_L1;}
+Py_DECREF(((PyObject *)__pyx_4)); __pyx_4 = 0;
+__pyx_3 = PyObject_GetAttr(__pyx_6, __pyx_kp_getargspec); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 4; __pyx_clineno = __LINE__; goto __pyx_L1;}
 Py_DECREF(__pyx_v_4lxml_5etree_inspect_getargspec);
-__pyx_v_4lxml_5etree_inspect_getargspec = __pyx_1;
-__pyx_1 = 0;
-Py_DECREF(__pyx_5); __pyx_5 = 0;
+__pyx_v_4lxml_5etree_inspect_getargspec = __pyx_3;
+__pyx_3 = 0;
+Py_DECREF(__pyx_6); __pyx_6 = 0;
 
 /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/parsertarget.pxi":6
  * from inspect import getargspec as inspect_getargspec
@@ -120563,12 +120543,12 @@
  *     # Admittedly, this is somewhat ugly, but it's the easiest way
  *     # to push the Python level parser result through the parser
  */
-__pyx_4 = PyDict_New(); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 6; __pyx_clineno = __LINE__; goto __pyx_L1;}
-__pyx_6 = PyTuple_New(1); if (unlikely(!__pyx_6)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 6; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_5 = PyDict_New(); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 6; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_1 = PyTuple_New(1); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 6; __pyx_clineno = __LINE__; goto __pyx_L1;}
 Py_INCREF(__pyx_builtin_Exception);
-PyTuple_SET_ITEM(__pyx_6, 0, __pyx_builtin_Exception);
-__pyx_8 = __Pyx_CreateClass(((PyObject *)__pyx_6), ((PyObject *)__pyx_4), __pyx_kp__TargetParserResult, "lxml.etree"); if (unlikely(!__pyx_8)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 6; __pyx_clineno = __LINE__; goto __pyx_L1;}
-Py_DECREF(((PyObject *)__pyx_6)); __pyx_6 = 0;
+PyTuple_SET_ITEM(__pyx_1, 0, __pyx_builtin_Exception);
+__pyx_8 = __Pyx_CreateClass(((PyObject *)__pyx_1), ((PyObject *)__pyx_5), __pyx_kp__TargetParserResult, "lxml.etree"); if (unlikely(!__pyx_8)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 6; __pyx_clineno = __LINE__; goto __pyx_L1;}
+Py_DECREF(((PyObject *)__pyx_1)); __pyx_1 = 0;
 
 /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/parsertarget.pxi":10
  *     # to push the Python level parser result through the parser
@@ -120577,14 +120557,14 @@
  *         self.result = result
  * 
  */
-__pyx_3 = PyCFunction_New(&__pyx_mdef_4lxml_5etree_19_TargetParserResult___init__, 0); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 10; __pyx_clineno = __LINE__; goto __pyx_L1;}
-__pyx_5 = PyMethod_New(__pyx_3, 0, __pyx_8); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 10; __pyx_clineno = __LINE__; goto __pyx_L1;}
-Py_DECREF(__pyx_3); __pyx_3 = 0;
-if (PyObject_SetAttr(__pyx_8, __pyx_kp___init__, __pyx_5) < 0) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 10; __pyx_clineno = __LINE__; goto __pyx_L1;}
-Py_DECREF(__pyx_5); __pyx_5 = 0;
+__pyx_4 = PyCFunction_New(&__pyx_mdef_4lxml_5etree_19_TargetParserResult___init__, 0); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 10; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_6 = PyMethod_New(__pyx_4, 0, __pyx_8); if (unlikely(!__pyx_6)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 10; __pyx_clineno = __LINE__; goto __pyx_L1;}
+Py_DECREF(__pyx_4); __pyx_4 = 0;
+if (PyObject_SetAttr(__pyx_8, __pyx_kp___init__, __pyx_6) < 0) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 10; __pyx_clineno = __LINE__; goto __pyx_L1;}
+Py_DECREF(__pyx_6); __pyx_6 = 0;
 if (PyObject_SetAttr(__pyx_m, __pyx_kp__TargetParserResult, __pyx_8) < 0) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 6; __pyx_clineno = __LINE__; goto __pyx_L1;}
 Py_DECREF(__pyx_8); __pyx_8 = 0;
-Py_DECREF(((PyObject *)__pyx_4)); __pyx_4 = 0;
+Py_DECREF(((PyObject *)__pyx_5)); __pyx_5 = 0;
 
 /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/iterparse.pxi":361
  *     cdef int (*_parse_chunk)(xmlparser.xmlParserCtxt* ctxt,
@@ -120593,11 +120573,11 @@
  *                  attribute_defaults=False, dtd_validation=False,
  *                  load_dtd=False, no_network=True, remove_blank_text=False,
  */
-__pyx_1 = PyTuple_New(1); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[12]; __pyx_lineno = 361; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_3 = PyTuple_New(1); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[12]; __pyx_lineno = 361; __pyx_clineno = __LINE__; goto __pyx_L1;}
 Py_INCREF(__pyx_kp_94);
-PyTuple_SET_ITEM(__pyx_1, 0, __pyx_kp_94);
-__pyx_k_95 = ((PyObject *)__pyx_1);
-__pyx_1 = 0;
+PyTuple_SET_ITEM(__pyx_3, 0, __pyx_kp_94);
+__pyx_k_95 = ((PyObject *)__pyx_3);
+__pyx_3 = 0;
 
 /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/iterparse.pxi":526
  *     cdef char*  _tag_name
@@ -120606,11 +120586,11 @@
  *         cdef _Element root
  *         cdef int ns_count
  */
-__pyx_6 = PyTuple_New(1); if (unlikely(!__pyx_6)) {__pyx_filename = __pyx_f[12]; __pyx_lineno = 526; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_1 = PyTuple_New(1); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[12]; __pyx_lineno = 526; __pyx_clineno = __LINE__; goto __pyx_L1;}
 Py_INCREF(__pyx_kp_96);
-PyTuple_SET_ITEM(__pyx_6, 0, __pyx_kp_96);
-__pyx_k_97 = ((PyObject *)__pyx_6);
-__pyx_6 = 0;
+PyTuple_SET_ITEM(__pyx_1, 0, __pyx_kp_96);
+__pyx_k_97 = ((PyObject *)__pyx_1);
+__pyx_1 = 0;
 
 /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/xinclude.pxi":5
  * cimport xinclude
@@ -120619,17 +120599,17 @@
  *     u"""Error during XInclude processing.
  *     """
  */
-__pyx_3 = PyDict_New(); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[14]; __pyx_lineno = 5; __pyx_clineno = __LINE__; goto __pyx_L1;}
-__pyx_5 = __Pyx_GetName(__pyx_m, __pyx_kp_LxmlError); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[14]; __pyx_lineno = 5; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_4 = PyDict_New(); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[14]; __pyx_lineno = 5; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_6 = __Pyx_GetName(__pyx_m, __pyx_kp_LxmlError); if (unlikely(!__pyx_6)) {__pyx_filename = __pyx_f[14]; __pyx_lineno = 5; __pyx_clineno = __LINE__; goto __pyx_L1;}
 __pyx_8 = PyTuple_New(1); if (unlikely(!__pyx_8)) {__pyx_filename = __pyx_f[14]; __pyx_lineno = 5; __pyx_clineno = __LINE__; goto __pyx_L1;}
-PyTuple_SET_ITEM(__pyx_8, 0, __pyx_5);
-__pyx_5 = 0;
-if (PyDict_SetItemString(((PyObject *)__pyx_3), "__doc__", __pyx_kp_98) < 0) {__pyx_filename = __pyx_f[14]; __pyx_lineno = 5; __pyx_clineno = __LINE__; goto __pyx_L1;}
-__pyx_4 = __Pyx_CreateClass(((PyObject *)__pyx_8), ((PyObject *)__pyx_3), __pyx_kp_XIncludeError, "lxml.etree"); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[14]; __pyx_lineno = 5; __pyx_clineno = __LINE__; goto __pyx_L1;}
+PyTuple_SET_ITEM(__pyx_8, 0, __pyx_6);
+__pyx_6 = 0;
+if (PyDict_SetItemString(((PyObject *)__pyx_4), "__doc__", __pyx_kp_98) < 0) {__pyx_filename = __pyx_f[14]; __pyx_lineno = 5; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_5 = __Pyx_CreateClass(((PyObject *)__pyx_8), ((PyObject *)__pyx_4), __pyx_kp_XIncludeError, "lxml.etree"); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[14]; __pyx_lineno = 5; __pyx_clineno = __LINE__; goto __pyx_L1;}
 Py_DECREF(((PyObject *)__pyx_8)); __pyx_8 = 0;
-if (PyObject_SetAttr(__pyx_m, __pyx_kp_XIncludeError, __pyx_4) < 0) {__pyx_filename = __pyx_f[14]; __pyx_lineno = 5; __pyx_clineno = __LINE__; goto __pyx_L1;}
-Py_DECREF(__pyx_4); __pyx_4 = 0;
-Py_DECREF(((PyObject *)__pyx_3)); __pyx_3 = 0;
+if (PyObject_SetAttr(__pyx_m, __pyx_kp_XIncludeError, __pyx_5) < 0) {__pyx_filename = __pyx_f[14]; __pyx_lineno = 5; __pyx_clineno = __LINE__; goto __pyx_L1;}
+Py_DECREF(__pyx_5); __pyx_5 = 0;
+Py_DECREF(((PyObject *)__pyx_4)); __pyx_4 = 0;
 
 /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/extensions.pxi":3
  * # support for extension functions in XPath and XSLT
@@ -120638,17 +120618,17 @@
  *     u"""Base class of all XPath errors.
  *     """
  */
-__pyx_5 = PyDict_New(); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[15]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_6 = PyDict_New(); if (unlikely(!__pyx_6)) {__pyx_filename = __pyx_f[15]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1;}
 __pyx_8 = __Pyx_GetName(__pyx_m, __pyx_kp_LxmlError); if (unlikely(!__pyx_8)) {__pyx_filename = __pyx_f[15]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1;}
-__pyx_4 = PyTuple_New(1); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[15]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1;}
-PyTuple_SET_ITEM(__pyx_4, 0, __pyx_8);
+__pyx_5 = PyTuple_New(1); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[15]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1;}
+PyTuple_SET_ITEM(__pyx_5, 0, __pyx_8);
 __pyx_8 = 0;
-if (PyDict_SetItemString(((PyObject *)__pyx_5), "__doc__", __pyx_kp_99) < 0) {__pyx_filename = __pyx_f[15]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1;}
-__pyx_3 = __Pyx_CreateClass(((PyObject *)__pyx_4), ((PyObject *)__pyx_5), __pyx_kp_XPathError, "lxml.etree"); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[15]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1;}
-Py_DECREF(((PyObject *)__pyx_4)); __pyx_4 = 0;
-if (PyObject_SetAttr(__pyx_m, __pyx_kp_XPathError, __pyx_3) < 0) {__pyx_filename = __pyx_f[15]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1;}
-Py_DECREF(__pyx_3); __pyx_3 = 0;
+if (PyDict_SetItemString(((PyObject *)__pyx_6), "__doc__", __pyx_kp_99) < 0) {__pyx_filename = __pyx_f[15]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_4 = __Pyx_CreateClass(((PyObject *)__pyx_5), ((PyObject *)__pyx_6), __pyx_kp_XPathError, "lxml.etree"); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[15]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1;}
 Py_DECREF(((PyObject *)__pyx_5)); __pyx_5 = 0;
+if (PyObject_SetAttr(__pyx_m, __pyx_kp_XPathError, __pyx_4) < 0) {__pyx_filename = __pyx_f[15]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1;}
+Py_DECREF(__pyx_4); __pyx_4 = 0;
+Py_DECREF(((PyObject *)__pyx_6)); __pyx_6 = 0;
 
 /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/extensions.pxi":8
  *     pass
@@ -120658,15 +120638,15 @@
  *     """
  */
 __pyx_8 = PyDict_New(); if (unlikely(!__pyx_8)) {__pyx_filename = __pyx_f[15]; __pyx_lineno = 8; __pyx_clineno = __LINE__; goto __pyx_L1;}
-__pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_XPathError); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[15]; __pyx_lineno = 8; __pyx_clineno = __LINE__; goto __pyx_L1;}
-__pyx_3 = PyTuple_New(1); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[15]; __pyx_lineno = 8; __pyx_clineno = __LINE__; goto __pyx_L1;}
-PyTuple_SET_ITEM(__pyx_3, 0, __pyx_4);
-__pyx_4 = 0;
+__pyx_5 = __Pyx_GetName(__pyx_m, __pyx_kp_XPathError); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[15]; __pyx_lineno = 8; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_4 = PyTuple_New(1); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[15]; __pyx_lineno = 8; __pyx_clineno = __LINE__; goto __pyx_L1;}
+PyTuple_SET_ITEM(__pyx_4, 0, __pyx_5);
+__pyx_5 = 0;
 if (PyDict_SetItemString(((PyObject *)__pyx_8), "__doc__", __pyx_kp_100) < 0) {__pyx_filename = __pyx_f[15]; __pyx_lineno = 8; __pyx_clineno = __LINE__; goto __pyx_L1;}
-__pyx_5 = __Pyx_CreateClass(((PyObject *)__pyx_3), ((PyObject *)__pyx_8), __pyx_kp_XPathEvalError, "lxml.etree"); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[15]; __pyx_lineno = 8; __pyx_clineno = __LINE__; goto __pyx_L1;}
-Py_DECREF(((PyObject *)__pyx_3)); __pyx_3 = 0;
-if (PyObject_SetAttr(__pyx_m, __pyx_kp_XPathEvalError, __pyx_5) < 0) {__pyx_filename = __pyx_f[15]; __pyx_lineno = 8; __pyx_clineno = __LINE__; goto __pyx_L1;}
-Py_DECREF(__pyx_5); __pyx_5 = 0;
+__pyx_6 = __Pyx_CreateClass(((PyObject *)__pyx_4), ((PyObject *)__pyx_8), __pyx_kp_XPathEvalError, "lxml.etree"); if (unlikely(!__pyx_6)) {__pyx_filename = __pyx_f[15]; __pyx_lineno = 8; __pyx_clineno = __LINE__; goto __pyx_L1;}
+Py_DECREF(((PyObject *)__pyx_4)); __pyx_4 = 0;
+if (PyObject_SetAttr(__pyx_m, __pyx_kp_XPathEvalError, __pyx_6) < 0) {__pyx_filename = __pyx_f[15]; __pyx_lineno = 8; __pyx_clineno = __LINE__; goto __pyx_L1;}
+Py_DECREF(__pyx_6); __pyx_6 = 0;
 Py_DECREF(((PyObject *)__pyx_8)); __pyx_8 = 0;
 
 /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/extensions.pxi":13
@@ -120676,17 +120656,17 @@
  *     u"""Internal error looking up an XPath extension function.
  *     """
  */
-__pyx_4 = PyDict_New(); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[15]; __pyx_lineno = 13; __pyx_clineno = __LINE__; goto __pyx_L1;}
-__pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_XPathEvalError); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[15]; __pyx_lineno = 13; __pyx_clineno = __LINE__; goto __pyx_L1;}
-__pyx_5 = PyTuple_New(1); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[15]; __pyx_lineno = 13; __pyx_clineno = __LINE__; goto __pyx_L1;}
-PyTuple_SET_ITEM(__pyx_5, 0, __pyx_3);
-__pyx_3 = 0;
-if (PyDict_SetItemString(((PyObject *)__pyx_4), "__doc__", __pyx_kp_101) < 0) {__pyx_filename = __pyx_f[15]; __pyx_lineno = 13; __pyx_clineno = __LINE__; goto __pyx_L1;}
-__pyx_8 = __Pyx_CreateClass(((PyObject *)__pyx_5), ((PyObject *)__pyx_4), __pyx_kp_XPathFunctionError, "lxml.etree"); if (unlikely(!__pyx_8)) {__pyx_filename = __pyx_f[15]; __pyx_lineno = 13; __pyx_clineno = __LINE__; goto __pyx_L1;}
-Py_DECREF(((PyObject *)__pyx_5)); __pyx_5 = 0;
+__pyx_5 = PyDict_New(); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[15]; __pyx_lineno = 13; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_XPathEvalError); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[15]; __pyx_lineno = 13; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_6 = PyTuple_New(1); if (unlikely(!__pyx_6)) {__pyx_filename = __pyx_f[15]; __pyx_lineno = 13; __pyx_clineno = __LINE__; goto __pyx_L1;}
+PyTuple_SET_ITEM(__pyx_6, 0, __pyx_4);
+__pyx_4 = 0;
+if (PyDict_SetItemString(((PyObject *)__pyx_5), "__doc__", __pyx_kp_101) < 0) {__pyx_filename = __pyx_f[15]; __pyx_lineno = 13; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_8 = __Pyx_CreateClass(((PyObject *)__pyx_6), ((PyObject *)__pyx_5), __pyx_kp_XPathFunctionError, "lxml.etree"); if (unlikely(!__pyx_8)) {__pyx_filename = __pyx_f[15]; __pyx_lineno = 13; __pyx_clineno = __LINE__; goto __pyx_L1;}
+Py_DECREF(((PyObject *)__pyx_6)); __pyx_6 = 0;
 if (PyObject_SetAttr(__pyx_m, __pyx_kp_XPathFunctionError, __pyx_8) < 0) {__pyx_filename = __pyx_f[15]; __pyx_lineno = 13; __pyx_clineno = __LINE__; goto __pyx_L1;}
 Py_DECREF(__pyx_8); __pyx_8 = 0;
-Py_DECREF(((PyObject *)__pyx_4)); __pyx_4 = 0;
+Py_DECREF(((PyObject *)__pyx_5)); __pyx_5 = 0;
 
 /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/extensions.pxi":18
  *     pass
@@ -120695,17 +120675,17 @@
  *     u"""Error handling an XPath result.
  *     """
  */
-__pyx_3 = PyDict_New(); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[15]; __pyx_lineno = 18; __pyx_clineno = __LINE__; goto __pyx_L1;}
-__pyx_5 = __Pyx_GetName(__pyx_m, __pyx_kp_XPathEvalError); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[15]; __pyx_lineno = 18; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_4 = PyDict_New(); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[15]; __pyx_lineno = 18; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_6 = __Pyx_GetName(__pyx_m, __pyx_kp_XPathEvalError); if (unlikely(!__pyx_6)) {__pyx_filename = __pyx_f[15]; __pyx_lineno = 18; __pyx_clineno = __LINE__; goto __pyx_L1;}
 __pyx_8 = PyTuple_New(1); if (unlikely(!__pyx_8)) {__pyx_filename = __pyx_f[15]; __pyx_lineno = 18; __pyx_clineno = __LINE__; goto __pyx_L1;}
-PyTuple_SET_ITEM(__pyx_8, 0, __pyx_5);
-__pyx_5 = 0;
-if (PyDict_SetItemString(((PyObject *)__pyx_3), "__doc__", __pyx_kp_102) < 0) {__pyx_filename = __pyx_f[15]; __pyx_lineno = 18; __pyx_clineno = __LINE__; goto __pyx_L1;}
-__pyx_4 = __Pyx_CreateClass(((PyObject *)__pyx_8), ((PyObject *)__pyx_3), __pyx_kp_XPathResultError, "lxml.etree"); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[15]; __pyx_lineno = 18; __pyx_clineno = __LINE__; goto __pyx_L1;}
+PyTuple_SET_ITEM(__pyx_8, 0, __pyx_6);
+__pyx_6 = 0;
+if (PyDict_SetItemString(((PyObject *)__pyx_4), "__doc__", __pyx_kp_102) < 0) {__pyx_filename = __pyx_f[15]; __pyx_lineno = 18; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_5 = __Pyx_CreateClass(((PyObject *)__pyx_8), ((PyObject *)__pyx_4), __pyx_kp_XPathResultError, "lxml.etree"); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[15]; __pyx_lineno = 18; __pyx_clineno = __LINE__; goto __pyx_L1;}
 Py_DECREF(((PyObject *)__pyx_8)); __pyx_8 = 0;
-if (PyObject_SetAttr(__pyx_m, __pyx_kp_XPathResultError, __pyx_4) < 0) {__pyx_filename = __pyx_f[15]; __pyx_lineno = 18; __pyx_clineno = __LINE__; goto __pyx_L1;}
-Py_DECREF(__pyx_4); __pyx_4 = 0;
-Py_DECREF(((PyObject *)__pyx_3)); __pyx_3 = 0;
+if (PyObject_SetAttr(__pyx_m, __pyx_kp_XPathResultError, __pyx_5) < 0) {__pyx_filename = __pyx_f[15]; __pyx_lineno = 18; __pyx_clineno = __LINE__; goto __pyx_L1;}
+Py_DECREF(__pyx_5); __pyx_5 = 0;
+Py_DECREF(((PyObject *)__pyx_4)); __pyx_4 = 0;
 
 /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/extensions.pxi":582
  *         return self._parent
@@ -120714,11 +120694,11 @@
  *     # we need to use a Python class here, str cannot be C-subclassed
  *     # in Pyrex/Cython
  */
-__pyx_5 = PyDict_New(); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[15]; __pyx_lineno = 582; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_6 = PyDict_New(); if (unlikely(!__pyx_6)) {__pyx_filename = __pyx_f[15]; __pyx_lineno = 582; __pyx_clineno = __LINE__; goto __pyx_L1;}
 __pyx_8 = PyTuple_New(1); if (unlikely(!__pyx_8)) {__pyx_filename = __pyx_f[15]; __pyx_lineno = 582; __pyx_clineno = __LINE__; goto __pyx_L1;}
 Py_INCREF(((PyObject*)&PyBytes_Type));
 PyTuple_SET_ITEM(__pyx_8, 0, ((PyObject*)&PyBytes_Type));
-__pyx_4 = __Pyx_CreateClass(((PyObject *)__pyx_8), ((PyObject *)__pyx_5), __pyx_kp_105, "lxml.etree"); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[15]; __pyx_lineno = 582; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_5 = __Pyx_CreateClass(((PyObject *)__pyx_8), ((PyObject *)__pyx_6), __pyx_kp_105, "lxml.etree"); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[15]; __pyx_lineno = 582; __pyx_clineno = __LINE__; goto __pyx_L1;}
 Py_DECREF(((PyObject *)__pyx_8)); __pyx_8 = 0;
 
 /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/extensions.pxi":585
@@ -120728,14 +120708,14 @@
  *         return self._parent
  * 
  */
-__pyx_3 = PyCFunction_New(&__pyx_mdef_4lxml_5etree_20_ElementStringResult_getparent, 0); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[15]; __pyx_lineno = 585; __pyx_clineno = __LINE__; goto __pyx_L1;}
-__pyx_8 = PyMethod_New(__pyx_3, 0, __pyx_4); if (unlikely(!__pyx_8)) {__pyx_filename = __pyx_f[15]; __pyx_lineno = 585; __pyx_clineno = __LINE__; goto __pyx_L1;}
-Py_DECREF(__pyx_3); __pyx_3 = 0;
-if (PyObject_SetAttr(__pyx_4, __pyx_kp_getparent, __pyx_8) < 0) {__pyx_filename = __pyx_f[15]; __pyx_lineno = 585; __pyx_clineno = __LINE__; goto __pyx_L1;}
-Py_DECREF(__pyx_8); __pyx_8 = 0;
-if (PyObject_SetAttr(__pyx_m, __pyx_kp_105, __pyx_4) < 0) {__pyx_filename = __pyx_f[15]; __pyx_lineno = 582; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_4 = PyCFunction_New(&__pyx_mdef_4lxml_5etree_20_ElementStringResult_getparent, 0); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[15]; __pyx_lineno = 585; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_8 = PyMethod_New(__pyx_4, 0, __pyx_5); if (unlikely(!__pyx_8)) {__pyx_filename = __pyx_f[15]; __pyx_lineno = 585; __pyx_clineno = __LINE__; goto __pyx_L1;}
 Py_DECREF(__pyx_4); __pyx_4 = 0;
-Py_DECREF(((PyObject *)__pyx_5)); __pyx_5 = 0;
+if (PyObject_SetAttr(__pyx_5, __pyx_kp_getparent, __pyx_8) < 0) {__pyx_filename = __pyx_f[15]; __pyx_lineno = 585; __pyx_clineno = __LINE__; goto __pyx_L1;}
+Py_DECREF(__pyx_8); __pyx_8 = 0;
+if (PyObject_SetAttr(__pyx_m, __pyx_kp_105, __pyx_5) < 0) {__pyx_filename = __pyx_f[15]; __pyx_lineno = 582; __pyx_clineno = __LINE__; goto __pyx_L1;}
+Py_DECREF(__pyx_5); __pyx_5 = 0;
+Py_DECREF(((PyObject *)__pyx_6)); __pyx_6 = 0;
 
 /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/xpath.pxi":3
  * # XPath evaluation
@@ -120744,19 +120724,19 @@
  *     pass
  * 
  */
-__pyx_3 = PyDict_New(); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[16]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_4 = PyDict_New(); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[16]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1;}
 __pyx_8 = __Pyx_GetName(__pyx_m, __pyx_kp_LxmlSyntaxError); if (unlikely(!__pyx_8)) {__pyx_filename = __pyx_f[16]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1;}
-__pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_XPathError); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[16]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1;}
-__pyx_5 = PyTuple_New(2); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[16]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1;}
-PyTuple_SET_ITEM(__pyx_5, 0, __pyx_8);
-PyTuple_SET_ITEM(__pyx_5, 1, __pyx_4);
+__pyx_5 = __Pyx_GetName(__pyx_m, __pyx_kp_XPathError); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[16]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_6 = PyTuple_New(2); if (unlikely(!__pyx_6)) {__pyx_filename = __pyx_f[16]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1;}
+PyTuple_SET_ITEM(__pyx_6, 0, __pyx_8);
+PyTuple_SET_ITEM(__pyx_6, 1, __pyx_5);
 __pyx_8 = 0;
-__pyx_4 = 0;
-__pyx_8 = __Pyx_CreateClass(((PyObject *)__pyx_5), ((PyObject *)__pyx_3), __pyx_kp_XPathSyntaxError, "lxml.etree"); if (unlikely(!__pyx_8)) {__pyx_filename = __pyx_f[16]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1;}
-Py_DECREF(((PyObject *)__pyx_5)); __pyx_5 = 0;
+__pyx_5 = 0;
+__pyx_8 = __Pyx_CreateClass(((PyObject *)__pyx_6), ((PyObject *)__pyx_4), __pyx_kp_XPathSyntaxError, "lxml.etree"); if (unlikely(!__pyx_8)) {__pyx_filename = __pyx_f[16]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1;}
+Py_DECREF(((PyObject *)__pyx_6)); __pyx_6 = 0;
 if (PyObject_SetAttr(__pyx_m, __pyx_kp_XPathSyntaxError, __pyx_8) < 0) {__pyx_filename = __pyx_f[16]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1;}
 Py_DECREF(__pyx_8); __pyx_8 = 0;
-Py_DECREF(((PyObject *)__pyx_3)); __pyx_3 = 0;
+Py_DECREF(((PyObject *)__pyx_4)); __pyx_4 = 0;
 
 /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/xpath.pxi":11
  * cdef object _XPATH_SYNTAX_ERRORS
@@ -120765,7 +120745,7 @@
  *     xmlerror.XML_XPATH_UNFINISHED_LITERAL_ERROR,
  *     xmlerror.XML_XPATH_VARIABLE_REF_ERROR,
  */
-__pyx_4 = PyInt_FromLong(XML_XPATH_NUMBER_ERROR); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[16]; __pyx_lineno = 11; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_5 = PyInt_FromLong(XML_XPATH_NUMBER_ERROR); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[16]; __pyx_lineno = 11; __pyx_clineno = __LINE__; goto __pyx_L1;}
 
 /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/xpath.pxi":12
  * _XPATH_SYNTAX_ERRORS = (
@@ -120774,7 +120754,7 @@
  *     xmlerror.XML_XPATH_VARIABLE_REF_ERROR,
  *     xmlerror.XML_XPATH_INVALID_PREDICATE_ERROR,
  */
-__pyx_5 = PyInt_FromLong(XML_XPATH_UNFINISHED_LITERAL_ERROR); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[16]; __pyx_lineno = 12; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_6 = PyInt_FromLong(XML_XPATH_UNFINISHED_LITERAL_ERROR); if (unlikely(!__pyx_6)) {__pyx_filename = __pyx_f[16]; __pyx_lineno = 12; __pyx_clineno = __LINE__; goto __pyx_L1;}
 
 /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/xpath.pxi":13
  *     xmlerror.XML_XPATH_NUMBER_ERROR,
@@ -120792,7 +120772,7 @@
  *     xmlerror.XML_XPATH_UNCLOSED_ERROR,
  *     xmlerror.XML_XPATH_INVALID_CHAR_ERROR
  */
-__pyx_3 = PyInt_FromLong(XML_XPATH_INVALID_PREDICATE_ERROR); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[16]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_4 = PyInt_FromLong(XML_XPATH_INVALID_PREDICATE_ERROR); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[16]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1;}
 
 /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/xpath.pxi":15
  *     xmlerror.XML_XPATH_VARIABLE_REF_ERROR,
@@ -120812,16 +120792,16 @@
  */
 __pyx_10 = PyInt_FromLong(XML_XPATH_INVALID_CHAR_ERROR); if (unlikely(!__pyx_10)) {__pyx_filename = __pyx_f[16]; __pyx_lineno = 16; __pyx_clineno = __LINE__; goto __pyx_L1;}
 __pyx_11 = PyTuple_New(6); if (unlikely(!__pyx_11)) {__pyx_filename = __pyx_f[16]; __pyx_lineno = 11; __pyx_clineno = __LINE__; goto __pyx_L1;}
-PyTuple_SET_ITEM(__pyx_11, 0, __pyx_4);
-PyTuple_SET_ITEM(__pyx_11, 1, __pyx_5);
+PyTuple_SET_ITEM(__pyx_11, 0, __pyx_5);
+PyTuple_SET_ITEM(__pyx_11, 1, __pyx_6);
 PyTuple_SET_ITEM(__pyx_11, 2, __pyx_8);
-PyTuple_SET_ITEM(__pyx_11, 3, __pyx_3);
+PyTuple_SET_ITEM(__pyx_11, 3, __pyx_4);
 PyTuple_SET_ITEM(__pyx_11, 4, __pyx_9);
 PyTuple_SET_ITEM(__pyx_11, 5, __pyx_10);
-__pyx_4 = 0;
 __pyx_5 = 0;
+__pyx_6 = 0;
 __pyx_8 = 0;
-__pyx_3 = 0;
+__pyx_4 = 0;
 __pyx_9 = 0;
 __pyx_10 = 0;
 Py_DECREF(__pyx_v_4lxml_5etree__XPATH_SYNTAX_ERRORS);
@@ -120835,7 +120815,7 @@
  *     xmlerror.XML_XPATH_UNDEF_PREFIX_ERROR,
  *     xmlerror.XML_XPATH_UNKNOWN_FUNC_ERROR,
  */
-__pyx_4 = PyInt_FromLong(XML_XPATH_UNDEF_VARIABLE_ERROR); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[16]; __pyx_lineno = 21; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_5 = PyInt_FromLong(XML_XPATH_UNDEF_VARIABLE_ERROR); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[16]; __pyx_lineno = 21; __pyx_clineno = __LINE__; goto __pyx_L1;}
 
 /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/xpath.pxi":22
  * _XPATH_EVAL_ERRORS = (
@@ -120844,7 +120824,7 @@
  *     xmlerror.XML_XPATH_UNKNOWN_FUNC_ERROR,
  *     xmlerror.XML_XPATH_INVALID_OPERAND,
  */
-__pyx_5 = PyInt_FromLong(XML_XPATH_UNDEF_PREFIX_ERROR); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[16]; __pyx_lineno = 22; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_6 = PyInt_FromLong(XML_XPATH_UNDEF_PREFIX_ERROR); if (unlikely(!__pyx_6)) {__pyx_filename = __pyx_f[16]; __pyx_lineno = 22; __pyx_clineno = __LINE__; goto __pyx_L1;}
 
 /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/xpath.pxi":23
  *     xmlerror.XML_XPATH_UNDEF_VARIABLE_ERROR,
@@ -120862,7 +120842,7 @@
  *     xmlerror.XML_XPATH_INVALID_TYPE,
  *     xmlerror.XML_XPATH_INVALID_ARITY,
  */
-__pyx_3 = PyInt_FromLong(XML_XPATH_INVALID_OPERAND); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[16]; __pyx_lineno = 24; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_4 = PyInt_FromLong(XML_XPATH_INVALID_OPERAND); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[16]; __pyx_lineno = 24; __pyx_clineno = __LINE__; goto __pyx_L1;}
 
 /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/xpath.pxi":25
  *     xmlerror.XML_XPATH_UNKNOWN_FUNC_ERROR,
@@ -120900,18 +120880,18 @@
  */
 __pyx_12 = PyInt_FromLong(XML_XPATH_INVALID_CTXT_POSITION); if (unlikely(!__pyx_12)) {__pyx_filename = __pyx_f[16]; __pyx_lineno = 28; __pyx_clineno = __LINE__; goto __pyx_L1;}
 __pyx_13 = PyTuple_New(8); if (unlikely(!__pyx_13)) {__pyx_filename = __pyx_f[16]; __pyx_lineno = 21; __pyx_clineno = __LINE__; goto __pyx_L1;}
-PyTuple_SET_ITEM(__pyx_13, 0, __pyx_4);
-PyTuple_SET_ITEM(__pyx_13, 1, __pyx_5);
+PyTuple_SET_ITEM(__pyx_13, 0, __pyx_5);
+PyTuple_SET_ITEM(__pyx_13, 1, __pyx_6);
 PyTuple_SET_ITEM(__pyx_13, 2, __pyx_8);
-PyTuple_SET_ITEM(__pyx_13, 3, __pyx_3);
+PyTuple_SET_ITEM(__pyx_13, 3, __pyx_4);
 PyTuple_SET_ITEM(__pyx_13, 4, __pyx_9);
 PyTuple_SET_ITEM(__pyx_13, 5, __pyx_10);
 PyTuple_SET_ITEM(__pyx_13, 6, __pyx_11);
 PyTuple_SET_ITEM(__pyx_13, 7, __pyx_12);
-__pyx_4 = 0;
 __pyx_5 = 0;
+__pyx_6 = 0;
 __pyx_8 = 0;
-__pyx_3 = 0;
+__pyx_4 = 0;
 __pyx_9 = 0;
 __pyx_10 = 0;
 __pyx_11 = 0;
@@ -120960,18 +120940,18 @@
  * _find_namespaces = re.compile('({[^}]+})').findall
  * 
  */
-__pyx_4 = PyObject_GetAttr(__pyx_v_4lxml_5etree_re, __pyx_kp_compile); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[16]; __pyx_lineno = 442; __pyx_clineno = __LINE__; goto __pyx_L1;}
-__pyx_5 = PyTuple_New(1); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[16]; __pyx_lineno = 442; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_5 = PyObject_GetAttr(__pyx_v_4lxml_5etree_re, __pyx_kp_compile); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[16]; __pyx_lineno = 442; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_6 = PyTuple_New(1); if (unlikely(!__pyx_6)) {__pyx_filename = __pyx_f[16]; __pyx_lineno = 442; __pyx_clineno = __LINE__; goto __pyx_L1;}
 Py_INCREF(__pyx_kp_106);
-PyTuple_SET_ITEM(__pyx_5, 0, __pyx_kp_106);
-__pyx_8 = PyObject_Call(__pyx_4, ((PyObject *)__pyx_5), NULL); if (unlikely(!__pyx_8)) {__pyx_filename = __pyx_f[16]; __pyx_lineno = 442; __pyx_clineno = __LINE__; goto __pyx_L1;}
-Py_DECREF(__pyx_4); __pyx_4 = 0;
-Py_DECREF(((PyObject *)__pyx_5)); __pyx_5 = 0;
-__pyx_3 = PyObject_GetAttr(__pyx_8, __pyx_kp_sub); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[16]; __pyx_lineno = 442; __pyx_clineno = __LINE__; goto __pyx_L1;}
+PyTuple_SET_ITEM(__pyx_6, 0, __pyx_kp_106);
+__pyx_8 = PyObject_Call(__pyx_5, ((PyObject *)__pyx_6), NULL); if (unlikely(!__pyx_8)) {__pyx_filename = __pyx_f[16]; __pyx_lineno = 442; __pyx_clineno = __LINE__; goto __pyx_L1;}
+Py_DECREF(__pyx_5); __pyx_5 = 0;
+Py_DECREF(((PyObject *)__pyx_6)); __pyx_6 = 0;
+__pyx_4 = PyObject_GetAttr(__pyx_8, __pyx_kp_sub); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[16]; __pyx_lineno = 442; __pyx_clineno = __LINE__; goto __pyx_L1;}
 Py_DECREF(__pyx_8); __pyx_8 = 0;
 Py_DECREF(__pyx_v_4lxml_5etree__replace_strings);
-__pyx_v_4lxml_5etree__replace_strings = __pyx_3;
-__pyx_3 = 0;
+__pyx_v_4lxml_5etree__replace_strings = __pyx_4;
+__pyx_4 = 0;
 
 /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/xpath.pxi":443
  * cdef object _find_namespaces
@@ -121001,13 +120981,13 @@
  *     """
  */
 __pyx_13 = PyDict_New(); if (unlikely(!__pyx_13)) {__pyx_filename = __pyx_f[17]; __pyx_lineno = 5; __pyx_clineno = __LINE__; goto __pyx_L1;}
-__pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_LxmlError); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[17]; __pyx_lineno = 5; __pyx_clineno = __LINE__; goto __pyx_L1;}
-__pyx_5 = PyTuple_New(1); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[17]; __pyx_lineno = 5; __pyx_clineno = __LINE__; goto __pyx_L1;}
-PyTuple_SET_ITEM(__pyx_5, 0, __pyx_4);
-__pyx_4 = 0;
+__pyx_5 = __Pyx_GetName(__pyx_m, __pyx_kp_LxmlError); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[17]; __pyx_lineno = 5; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_6 = PyTuple_New(1); if (unlikely(!__pyx_6)) {__pyx_filename = __pyx_f[17]; __pyx_lineno = 5; __pyx_clineno = __LINE__; goto __pyx_L1;}
+PyTuple_SET_ITEM(__pyx_6, 0, __pyx_5);
+__pyx_5 = 0;
 if (PyDict_SetItemString(((PyObject *)__pyx_13), "__doc__", __pyx_kp_108) < 0) {__pyx_filename = __pyx_f[17]; __pyx_lineno = 5; __pyx_clineno = __LINE__; goto __pyx_L1;}
-__pyx_8 = __Pyx_CreateClass(((PyObject *)__pyx_5), ((PyObject *)__pyx_13), __pyx_kp_XSLTError, "lxml.etree"); if (unlikely(!__pyx_8)) {__pyx_filename = __pyx_f[17]; __pyx_lineno = 5; __pyx_clineno = __LINE__; goto __pyx_L1;}
-Py_DECREF(((PyObject *)__pyx_5)); __pyx_5 = 0;
+__pyx_8 = __Pyx_CreateClass(((PyObject *)__pyx_6), ((PyObject *)__pyx_13), __pyx_kp_XSLTError, "lxml.etree"); if (unlikely(!__pyx_8)) {__pyx_filename = __pyx_f[17]; __pyx_lineno = 5; __pyx_clineno = __LINE__; goto __pyx_L1;}
+Py_DECREF(((PyObject *)__pyx_6)); __pyx_6 = 0;
 if (PyObject_SetAttr(__pyx_m, __pyx_kp_XSLTError, __pyx_8) < 0) {__pyx_filename = __pyx_f[17]; __pyx_lineno = 5; __pyx_clineno = __LINE__; goto __pyx_L1;}
 Py_DECREF(__pyx_8); __pyx_8 = 0;
 Py_DECREF(((PyObject *)__pyx_13)); __pyx_13 = 0;
@@ -121019,17 +120999,17 @@
  *     u"""Error parsing a stylesheet document.
  *     """
  */
-__pyx_3 = PyDict_New(); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[17]; __pyx_lineno = 10; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_4 = PyDict_New(); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[17]; __pyx_lineno = 10; __pyx_clineno = __LINE__; goto __pyx_L1;}
 __pyx_9 = __Pyx_GetName(__pyx_m, __pyx_kp_XSLTError); if (unlikely(!__pyx_9)) {__pyx_filename = __pyx_f[17]; __pyx_lineno = 10; __pyx_clineno = __LINE__; goto __pyx_L1;}
 __pyx_10 = PyTuple_New(1); if (unlikely(!__pyx_10)) {__pyx_filename = __pyx_f[17]; __pyx_lineno = 10; __pyx_clineno = __LINE__; goto __pyx_L1;}
 PyTuple_SET_ITEM(__pyx_10, 0, __pyx_9);
 __pyx_9 = 0;
-if (PyDict_SetItemString(((PyObject *)__pyx_3), "__doc__", __pyx_kp_109) < 0) {__pyx_filename = __pyx_f[17]; __pyx_lineno = 10; __pyx_clineno = __LINE__; goto __pyx_L1;}
-__pyx_11 = __Pyx_CreateClass(((PyObject *)__pyx_10), ((PyObject *)__pyx_3), __pyx_kp_XSLTParseError, "lxml.etree"); if (unlikely(!__pyx_11)) {__pyx_filename = __pyx_f[17]; __pyx_lineno = 10; __pyx_clineno = __LINE__; goto __pyx_L1;}
+if (PyDict_SetItemString(((PyObject *)__pyx_4), "__doc__", __pyx_kp_109) < 0) {__pyx_filename = __pyx_f[17]; __pyx_lineno = 10; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_11 = __Pyx_CreateClass(((PyObject *)__pyx_10), ((PyObject *)__pyx_4), __pyx_kp_XSLTParseError, "lxml.etree"); if (unlikely(!__pyx_11)) {__pyx_filename = __pyx_f[17]; __pyx_lineno = 10; __pyx_clineno = __LINE__; goto __pyx_L1;}
 Py_DECREF(((PyObject *)__pyx_10)); __pyx_10 = 0;
 if (PyObject_SetAttr(__pyx_m, __pyx_kp_XSLTParseError, __pyx_11) < 0) {__pyx_filename = __pyx_f[17]; __pyx_lineno = 10; __pyx_clineno = __LINE__; goto __pyx_L1;}
 Py_DECREF(__pyx_11); __pyx_11 = 0;
-Py_DECREF(((PyObject *)__pyx_3)); __pyx_3 = 0;
+Py_DECREF(((PyObject *)__pyx_4)); __pyx_4 = 0;
 
 /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/xslt.pxi":15
  *     pass
@@ -121039,13 +121019,13 @@
  *     """
  */
 __pyx_12 = PyDict_New(); if (unlikely(!__pyx_12)) {__pyx_filename = __pyx_f[17]; __pyx_lineno = 15; __pyx_clineno = __LINE__; goto __pyx_L1;}
-__pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_XSLTError); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[17]; __pyx_lineno = 15; __pyx_clineno = __LINE__; goto __pyx_L1;}
-__pyx_5 = PyTuple_New(1); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[17]; __pyx_lineno = 15; __pyx_clineno = __LINE__; goto __pyx_L1;}
-PyTuple_SET_ITEM(__pyx_5, 0, __pyx_4);
-__pyx_4 = 0;
+__pyx_5 = __Pyx_GetName(__pyx_m, __pyx_kp_XSLTError); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[17]; __pyx_lineno = 15; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_6 = PyTuple_New(1); if (unlikely(!__pyx_6)) {__pyx_filename = __pyx_f[17]; __pyx_lineno = 15; __pyx_clineno = __LINE__; goto __pyx_L1;}
+PyTuple_SET_ITEM(__pyx_6, 0, __pyx_5);
+__pyx_5 = 0;
 if (PyDict_SetItemString(((PyObject *)__pyx_12), "__doc__", __pyx_kp_110) < 0) {__pyx_filename = __pyx_f[17]; __pyx_lineno = 15; __pyx_clineno = __LINE__; goto __pyx_L1;}
-__pyx_8 = __Pyx_CreateClass(((PyObject *)__pyx_5), ((PyObject *)__pyx_12), __pyx_kp_XSLTApplyError, "lxml.etree"); if (unlikely(!__pyx_8)) {__pyx_filename = __pyx_f[17]; __pyx_lineno = 15; __pyx_clineno = __LINE__; goto __pyx_L1;}
-Py_DECREF(((PyObject *)__pyx_5)); __pyx_5 = 0;
+__pyx_8 = __Pyx_CreateClass(((PyObject *)__pyx_6), ((PyObject *)__pyx_12), __pyx_kp_XSLTApplyError, "lxml.etree"); if (unlikely(!__pyx_8)) {__pyx_filename = __pyx_f[17]; __pyx_lineno = 15; __pyx_clineno = __LINE__; goto __pyx_L1;}
+Py_DECREF(((PyObject *)__pyx_6)); __pyx_6 = 0;
 if (PyObject_SetAttr(__pyx_m, __pyx_kp_XSLTApplyError, __pyx_8) < 0) {__pyx_filename = __pyx_f[17]; __pyx_lineno = 15; __pyx_clineno = __LINE__; goto __pyx_L1;}
 Py_DECREF(__pyx_8); __pyx_8 = 0;
 Py_DECREF(((PyObject *)__pyx_12)); __pyx_12 = 0;
@@ -121076,17 +121056,17 @@
  *     u"""Error registering an XSLT extension.
  *     """
  */
-__pyx_3 = PyDict_New(); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[17]; __pyx_lineno = 25; __pyx_clineno = __LINE__; goto __pyx_L1;}
-__pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_XSLTError); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[17]; __pyx_lineno = 25; __pyx_clineno = __LINE__; goto __pyx_L1;}
-__pyx_5 = PyTuple_New(1); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[17]; __pyx_lineno = 25; __pyx_clineno = __LINE__; goto __pyx_L1;}
-PyTuple_SET_ITEM(__pyx_5, 0, __pyx_4);
-__pyx_4 = 0;
-if (PyDict_SetItemString(((PyObject *)__pyx_3), "__doc__", __pyx_kp_112) < 0) {__pyx_filename = __pyx_f[17]; __pyx_lineno = 25; __pyx_clineno = __LINE__; goto __pyx_L1;}
-__pyx_8 = __Pyx_CreateClass(((PyObject *)__pyx_5), ((PyObject *)__pyx_3), __pyx_kp_XSLTExtensionError, "lxml.etree"); if (unlikely(!__pyx_8)) {__pyx_filename = __pyx_f[17]; __pyx_lineno = 25; __pyx_clineno = __LINE__; goto __pyx_L1;}
-Py_DECREF(((PyObject *)__pyx_5)); __pyx_5 = 0;
+__pyx_4 = PyDict_New(); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[17]; __pyx_lineno = 25; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_5 = __Pyx_GetName(__pyx_m, __pyx_kp_XSLTError); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[17]; __pyx_lineno = 25; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_6 = PyTuple_New(1); if (unlikely(!__pyx_6)) {__pyx_filename = __pyx_f[17]; __pyx_lineno = 25; __pyx_clineno = __LINE__; goto __pyx_L1;}
+PyTuple_SET_ITEM(__pyx_6, 0, __pyx_5);
+__pyx_5 = 0;
+if (PyDict_SetItemString(((PyObject *)__pyx_4), "__doc__", __pyx_kp_112) < 0) {__pyx_filename = __pyx_f[17]; __pyx_lineno = 25; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_8 = __Pyx_CreateClass(((PyObject *)__pyx_6), ((PyObject *)__pyx_4), __pyx_kp_XSLTExtensionError, "lxml.etree"); if (unlikely(!__pyx_8)) {__pyx_filename = __pyx_f[17]; __pyx_lineno = 25; __pyx_clineno = __LINE__; goto __pyx_L1;}
+Py_DECREF(((PyObject *)__pyx_6)); __pyx_6 = 0;
 if (PyObject_SetAttr(__pyx_m, __pyx_kp_XSLTExtensionError, __pyx_8) < 0) {__pyx_filename = __pyx_f[17]; __pyx_lineno = 25; __pyx_clineno = __LINE__; goto __pyx_L1;}
 Py_DECREF(__pyx_8); __pyx_8 = 0;
-Py_DECREF(((PyObject *)__pyx_3)); __pyx_3 = 0;
+Py_DECREF(((PyObject *)__pyx_4)); __pyx_4 = 0;
 
 /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/xslt.pxi":31
  * 
@@ -121191,9 +121171,9 @@
  */
 if (PyDict_SetItem(__pyx_13, __pyx_kp_read_network, Py_True) < 0) {__pyx_filename = __pyx_f[17]; __pyx_lineno = 209; __pyx_clineno = __LINE__; goto __pyx_L1;}
 if (PyDict_SetItem(__pyx_13, __pyx_kp_write_network, Py_False) < 0) {__pyx_filename = __pyx_f[17]; __pyx_lineno = 209; __pyx_clineno = __LINE__; goto __pyx_L1;}
-__pyx_4 = PyEval_CallObjectWithKeywords(((PyObject*)__pyx_ptype_4lxml_5etree_XSLTAccessControl), ((PyObject *)__pyx_empty_tuple), ((PyObject *)__pyx_13)); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[17]; __pyx_lineno = 209; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_5 = PyEval_CallObjectWithKeywords(((PyObject*)__pyx_ptype_4lxml_5etree_XSLTAccessControl), ((PyObject *)__pyx_empty_tuple), ((PyObject *)__pyx_13)); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[17]; __pyx_lineno = 209; __pyx_clineno = __LINE__; goto __pyx_L1;}
 Py_DECREF(((PyObject *)__pyx_13)); __pyx_13 = 0;
-if (PyDict_SetItem((PyObject *)__pyx_ptype_4lxml_5etree_XSLTAccessControl->tp_dict, __pyx_kp_DENY_WRITE, __pyx_4) < 0) {__pyx_filename = __pyx_f[17]; __pyx_lineno = 209; __pyx_clineno = __LINE__; goto __pyx_L1;}
+if (PyDict_SetItem((PyObject *)__pyx_ptype_4lxml_5etree_XSLTAccessControl->tp_dict, __pyx_kp_DENY_WRITE, __pyx_5) < 0) {__pyx_filename = __pyx_f[17]; __pyx_lineno = 209; __pyx_clineno = __LINE__; goto __pyx_L1;}
 __Pyx_TypeModified(__pyx_ptype_4lxml_5etree_XSLTAccessControl);
 
 /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/xslt.pxi":749
@@ -121221,16 +121201,16 @@
  * 
  * cdef object _RE_PI_HREF
  */
-__pyx_5 = PyObject_GetAttr(__pyx_v_4lxml_5etree_re, __pyx_kp_compile); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[17]; __pyx_lineno = 762; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_6 = PyObject_GetAttr(__pyx_v_4lxml_5etree_re, __pyx_kp_compile); if (unlikely(!__pyx_6)) {__pyx_filename = __pyx_f[17]; __pyx_lineno = 762; __pyx_clineno = __LINE__; goto __pyx_L1;}
 __pyx_8 = PyObject_GetAttr(__pyx_v_4lxml_5etree_re, __pyx_kp_U); if (unlikely(!__pyx_8)) {__pyx_filename = __pyx_f[17]; __pyx_lineno = 762; __pyx_clineno = __LINE__; goto __pyx_L1;}
-__pyx_3 = PyTuple_New(2); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[17]; __pyx_lineno = 762; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_4 = PyTuple_New(2); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[17]; __pyx_lineno = 762; __pyx_clineno = __LINE__; goto __pyx_L1;}
 Py_INCREF(__pyx_kp_114);
-PyTuple_SET_ITEM(__pyx_3, 0, __pyx_kp_114);
-PyTuple_SET_ITEM(__pyx_3, 1, __pyx_8);
+PyTuple_SET_ITEM(__pyx_4, 0, __pyx_kp_114);
+PyTuple_SET_ITEM(__pyx_4, 1, __pyx_8);
 __pyx_8 = 0;
-__pyx_12 = PyObject_Call(__pyx_5, ((PyObject *)__pyx_3), NULL); if (unlikely(!__pyx_12)) {__pyx_filename = __pyx_f[17]; __pyx_lineno = 762; __pyx_clineno = __LINE__; goto __pyx_L1;}
-Py_DECREF(__pyx_5); __pyx_5 = 0;
-Py_DECREF(((PyObject *)__pyx_3)); __pyx_3 = 0;
+__pyx_12 = PyObject_Call(__pyx_6, ((PyObject *)__pyx_4), NULL); if (unlikely(!__pyx_12)) {__pyx_filename = __pyx_f[17]; __pyx_lineno = 762; __pyx_clineno = __LINE__; goto __pyx_L1;}
+Py_DECREF(__pyx_6); __pyx_6 = 0;
+Py_DECREF(((PyObject *)__pyx_4)); __pyx_4 = 0;
 __pyx_9 = PyObject_GetAttr(__pyx_12, __pyx_kp_findall); if (unlikely(!__pyx_9)) {__pyx_filename = __pyx_f[17]; __pyx_lineno = 762; __pyx_clineno = __LINE__; goto __pyx_L1;}
 Py_DECREF(__pyx_12); __pyx_12 = 0;
 Py_DECREF(__pyx_v_4lxml_5etree__FIND_PI_ATTRIBUTES);
@@ -121262,10 +121242,10 @@
  * 
  * cdef object _REPLACE_PI_HREF
  */
-__pyx_4 = PyObject_GetAttr(__pyx_v_4lxml_5etree__RE_PI_HREF, __pyx_kp_findall); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[17]; __pyx_lineno = 768; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_5 = PyObject_GetAttr(__pyx_v_4lxml_5etree__RE_PI_HREF, __pyx_kp_findall); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[17]; __pyx_lineno = 768; __pyx_clineno = __LINE__; goto __pyx_L1;}
 Py_DECREF(__pyx_v_4lxml_5etree__FIND_PI_HREF);
-__pyx_v_4lxml_5etree__FIND_PI_HREF = __pyx_4;
-__pyx_4 = 0;
+__pyx_v_4lxml_5etree__FIND_PI_HREF = __pyx_5;
+__pyx_5 = 0;
 
 /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/xslt.pxi":771
  * 
@@ -121297,17 +121277,17 @@
  *     u"""Validation error.
  * 
  */
-__pyx_5 = PyDict_New(); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2622; __pyx_clineno = __LINE__; goto __pyx_L1;}
-__pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_LxmlError); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2622; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_6 = PyDict_New(); if (unlikely(!__pyx_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2622; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_LxmlError); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2622; __pyx_clineno = __LINE__; goto __pyx_L1;}
 __pyx_12 = PyTuple_New(1); if (unlikely(!__pyx_12)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2622; __pyx_clineno = __LINE__; goto __pyx_L1;}
-PyTuple_SET_ITEM(__pyx_12, 0, __pyx_3);
-__pyx_3 = 0;
-if (PyDict_SetItemString(((PyObject *)__pyx_5), "__doc__", __pyx_kp_116) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2622; __pyx_clineno = __LINE__; goto __pyx_L1;}
-__pyx_9 = __Pyx_CreateClass(((PyObject *)__pyx_12), ((PyObject *)__pyx_5), __pyx_kp_DocumentInvalid, "lxml.etree"); if (unlikely(!__pyx_9)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2622; __pyx_clineno = __LINE__; goto __pyx_L1;}
+PyTuple_SET_ITEM(__pyx_12, 0, __pyx_4);
+__pyx_4 = 0;
+if (PyDict_SetItemString(((PyObject *)__pyx_6), "__doc__", __pyx_kp_116) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2622; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_9 = __Pyx_CreateClass(((PyObject *)__pyx_12), ((PyObject *)__pyx_6), __pyx_kp_DocumentInvalid, "lxml.etree"); if (unlikely(!__pyx_9)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2622; __pyx_clineno = __LINE__; goto __pyx_L1;}
 Py_DECREF(((PyObject *)__pyx_12)); __pyx_12 = 0;
 if (PyObject_SetAttr(__pyx_m, __pyx_kp_DocumentInvalid, __pyx_9) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 2622; __pyx_clineno = __LINE__; goto __pyx_L1;}
 Py_DECREF(__pyx_9); __pyx_9 = 0;
-Py_DECREF(((PyObject *)__pyx_5)); __pyx_5 = 0;
+Py_DECREF(((PyObject *)__pyx_6)); __pyx_6 = 0;
 
 /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/dtd.pxi":4
  * cimport dtdvalid
@@ -121322,10 +121302,10 @@
 PyTuple_SET_ITEM(__pyx_13, 0, __pyx_11);
 __pyx_11 = 0;
 if (PyDict_SetItemString(((PyObject *)__pyx_10), "__doc__", __pyx_kp_117) < 0) {__pyx_filename = __pyx_f[19]; __pyx_lineno = 4; __pyx_clineno = __LINE__; goto __pyx_L1;}
-__pyx_4 = __Pyx_CreateClass(((PyObject *)__pyx_13), ((PyObject *)__pyx_10), __pyx_kp_DTDError, "lxml.etree"); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[19]; __pyx_lineno = 4; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_5 = __Pyx_CreateClass(((PyObject *)__pyx_13), ((PyObject *)__pyx_10), __pyx_kp_DTDError, "lxml.etree"); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[19]; __pyx_lineno = 4; __pyx_clineno = __LINE__; goto __pyx_L1;}
 Py_DECREF(((PyObject *)__pyx_13)); __pyx_13 = 0;
-if (PyObject_SetAttr(__pyx_m, __pyx_kp_DTDError, __pyx_4) < 0) {__pyx_filename = __pyx_f[19]; __pyx_lineno = 4; __pyx_clineno = __LINE__; goto __pyx_L1;}
-Py_DECREF(__pyx_4); __pyx_4 = 0;
+if (PyObject_SetAttr(__pyx_m, __pyx_kp_DTDError, __pyx_5) < 0) {__pyx_filename = __pyx_f[19]; __pyx_lineno = 4; __pyx_clineno = __LINE__; goto __pyx_L1;}
+Py_DECREF(__pyx_5); __pyx_5 = 0;
 Py_DECREF(((PyObject *)__pyx_10)); __pyx_10 = 0;
 
 /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/dtd.pxi":9
@@ -121336,10 +121316,10 @@
  *     """
  */
 __pyx_8 = PyDict_New(); if (unlikely(!__pyx_8)) {__pyx_filename = __pyx_f[19]; __pyx_lineno = 9; __pyx_clineno = __LINE__; goto __pyx_L1;}
-__pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_DTDError); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[19]; __pyx_lineno = 9; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_DTDError); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[19]; __pyx_lineno = 9; __pyx_clineno = __LINE__; goto __pyx_L1;}
 __pyx_12 = PyTuple_New(1); if (unlikely(!__pyx_12)) {__pyx_filename = __pyx_f[19]; __pyx_lineno = 9; __pyx_clineno = __LINE__; goto __pyx_L1;}
-PyTuple_SET_ITEM(__pyx_12, 0, __pyx_3);
-__pyx_3 = 0;
+PyTuple_SET_ITEM(__pyx_12, 0, __pyx_4);
+__pyx_4 = 0;
 if (PyDict_SetItemString(((PyObject *)__pyx_8), "__doc__", __pyx_kp_118) < 0) {__pyx_filename = __pyx_f[19]; __pyx_lineno = 9; __pyx_clineno = __LINE__; goto __pyx_L1;}
 __pyx_9 = __Pyx_CreateClass(((PyObject *)__pyx_12), ((PyObject *)__pyx_8), __pyx_kp_DTDParseError, "lxml.etree"); if (unlikely(!__pyx_9)) {__pyx_filename = __pyx_f[19]; __pyx_lineno = 9; __pyx_clineno = __LINE__; goto __pyx_L1;}
 Py_DECREF(((PyObject *)__pyx_12)); __pyx_12 = 0;
@@ -121354,17 +121334,17 @@
  *     u"""Error while validating an XML document with a DTD.
  *     """
  */
-__pyx_5 = PyDict_New(); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[19]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_6 = PyDict_New(); if (unlikely(!__pyx_6)) {__pyx_filename = __pyx_f[19]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1;}
 __pyx_11 = __Pyx_GetName(__pyx_m, __pyx_kp_DTDError); if (unlikely(!__pyx_11)) {__pyx_filename = __pyx_f[19]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1;}
 __pyx_13 = PyTuple_New(1); if (unlikely(!__pyx_13)) {__pyx_filename = __pyx_f[19]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1;}
 PyTuple_SET_ITEM(__pyx_13, 0, __pyx_11);
 __pyx_11 = 0;
-if (PyDict_SetItemString(((PyObject *)__pyx_5), "__doc__", __pyx_kp_119) < 0) {__pyx_filename = __pyx_f[19]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1;}
-__pyx_4 = __Pyx_CreateClass(((PyObject *)__pyx_13), ((PyObject *)__pyx_5), __pyx_kp_DTDValidateError, "lxml.etree"); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[19]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1;}
+if (PyDict_SetItemString(((PyObject *)__pyx_6), "__doc__", __pyx_kp_119) < 0) {__pyx_filename = __pyx_f[19]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_5 = __Pyx_CreateClass(((PyObject *)__pyx_13), ((PyObject *)__pyx_6), __pyx_kp_DTDValidateError, "lxml.etree"); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[19]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1;}
 Py_DECREF(((PyObject *)__pyx_13)); __pyx_13 = 0;
-if (PyObject_SetAttr(__pyx_m, __pyx_kp_DTDValidateError, __pyx_4) < 0) {__pyx_filename = __pyx_f[19]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1;}
-Py_DECREF(__pyx_4); __pyx_4 = 0;
-Py_DECREF(((PyObject *)__pyx_5)); __pyx_5 = 0;
+if (PyObject_SetAttr(__pyx_m, __pyx_kp_DTDValidateError, __pyx_5) < 0) {__pyx_filename = __pyx_f[19]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1;}
+Py_DECREF(__pyx_5); __pyx_5 = 0;
+Py_DECREF(((PyObject *)__pyx_6)); __pyx_6 = 0;
 
 /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/relaxng.pxi":4
  * cimport relaxng
@@ -121374,10 +121354,10 @@
  *     """
  */
 __pyx_10 = PyDict_New(); if (unlikely(!__pyx_10)) {__pyx_filename = __pyx_f[20]; __pyx_lineno = 4; __pyx_clineno = __LINE__; goto __pyx_L1;}
-__pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_LxmlError); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[20]; __pyx_lineno = 4; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_LxmlError); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[20]; __pyx_lineno = 4; __pyx_clineno = __LINE__; goto __pyx_L1;}
 __pyx_12 = PyTuple_New(1); if (unlikely(!__pyx_12)) {__pyx_filename = __pyx_f[20]; __pyx_lineno = 4; __pyx_clineno = __LINE__; goto __pyx_L1;}
-PyTuple_SET_ITEM(__pyx_12, 0, __pyx_3);
-__pyx_3 = 0;
+PyTuple_SET_ITEM(__pyx_12, 0, __pyx_4);
+__pyx_4 = 0;
 if (PyDict_SetItemString(((PyObject *)__pyx_10), "__doc__", __pyx_kp_120) < 0) {__pyx_filename = __pyx_f[20]; __pyx_lineno = 4; __pyx_clineno = __LINE__; goto __pyx_L1;}
 __pyx_9 = __Pyx_CreateClass(((PyObject *)__pyx_12), ((PyObject *)__pyx_10), __pyx_kp_RelaxNGError, "lxml.etree"); if (unlikely(!__pyx_9)) {__pyx_filename = __pyx_f[20]; __pyx_lineno = 4; __pyx_clineno = __LINE__; goto __pyx_L1;}
 Py_DECREF(((PyObject *)__pyx_12)); __pyx_12 = 0;
@@ -121398,10 +121378,10 @@
 PyTuple_SET_ITEM(__pyx_13, 0, __pyx_11);
 __pyx_11 = 0;
 if (PyDict_SetItemString(((PyObject *)__pyx_8), "__doc__", __pyx_kp_121) < 0) {__pyx_filename = __pyx_f[20]; __pyx_lineno = 9; __pyx_clineno = __LINE__; goto __pyx_L1;}
-__pyx_4 = __Pyx_CreateClass(((PyObject *)__pyx_13), ((PyObject *)__pyx_8), __pyx_kp_RelaxNGParseError, "lxml.etree"); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[20]; __pyx_lineno = 9; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_5 = __Pyx_CreateClass(((PyObject *)__pyx_13), ((PyObject *)__pyx_8), __pyx_kp_RelaxNGParseError, "lxml.etree"); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[20]; __pyx_lineno = 9; __pyx_clineno = __LINE__; goto __pyx_L1;}
 Py_DECREF(((PyObject *)__pyx_13)); __pyx_13 = 0;
-if (PyObject_SetAttr(__pyx_m, __pyx_kp_RelaxNGParseError, __pyx_4) < 0) {__pyx_filename = __pyx_f[20]; __pyx_lineno = 9; __pyx_clineno = __LINE__; goto __pyx_L1;}
-Py_DECREF(__pyx_4); __pyx_4 = 0;
+if (PyObject_SetAttr(__pyx_m, __pyx_kp_RelaxNGParseError, __pyx_5) < 0) {__pyx_filename = __pyx_f[20]; __pyx_lineno = 9; __pyx_clineno = __LINE__; goto __pyx_L1;}
+Py_DECREF(__pyx_5); __pyx_5 = 0;
 Py_DECREF(((PyObject *)__pyx_8)); __pyx_8 = 0;
 
 /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/relaxng.pxi":14
@@ -121411,17 +121391,17 @@
  *     u"""Error while validating an XML document with a RelaxNG schema.
  *     """
  */
-__pyx_5 = PyDict_New(); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[20]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1;}
-__pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_RelaxNGError); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[20]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_6 = PyDict_New(); if (unlikely(!__pyx_6)) {__pyx_filename = __pyx_f[20]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_RelaxNGError); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[20]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1;}
 __pyx_12 = PyTuple_New(1); if (unlikely(!__pyx_12)) {__pyx_filename = __pyx_f[20]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1;}
-PyTuple_SET_ITEM(__pyx_12, 0, __pyx_3);
-__pyx_3 = 0;
-if (PyDict_SetItemString(((PyObject *)__pyx_5), "__doc__", __pyx_kp_123) < 0) {__pyx_filename = __pyx_f[20]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1;}
-__pyx_9 = __Pyx_CreateClass(((PyObject *)__pyx_12), ((PyObject *)__pyx_5), __pyx_kp_122, "lxml.etree"); if (unlikely(!__pyx_9)) {__pyx_filename = __pyx_f[20]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1;}
+PyTuple_SET_ITEM(__pyx_12, 0, __pyx_4);
+__pyx_4 = 0;
+if (PyDict_SetItemString(((PyObject *)__pyx_6), "__doc__", __pyx_kp_123) < 0) {__pyx_filename = __pyx_f[20]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_9 = __Pyx_CreateClass(((PyObject *)__pyx_12), ((PyObject *)__pyx_6), __pyx_kp_122, "lxml.etree"); if (unlikely(!__pyx_9)) {__pyx_filename = __pyx_f[20]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1;}
 Py_DECREF(((PyObject *)__pyx_12)); __pyx_12 = 0;
 if (PyObject_SetAttr(__pyx_m, __pyx_kp_122, __pyx_9) < 0) {__pyx_filename = __pyx_f[20]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1;}
 Py_DECREF(__pyx_9); __pyx_9 = 0;
-Py_DECREF(((PyObject *)__pyx_5)); __pyx_5 = 0;
+Py_DECREF(((PyObject *)__pyx_6)); __pyx_6 = 0;
 
 /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/xmlschema.pxi":4
  * cimport xmlschema
@@ -121436,10 +121416,10 @@
 PyTuple_SET_ITEM(__pyx_13, 0, __pyx_11);
 __pyx_11 = 0;
 if (PyDict_SetItemString(((PyObject *)__pyx_10), "__doc__", __pyx_kp_124) < 0) {__pyx_filename = __pyx_f[21]; __pyx_lineno = 4; __pyx_clineno = __LINE__; goto __pyx_L1;}
-__pyx_4 = __Pyx_CreateClass(((PyObject *)__pyx_13), ((PyObject *)__pyx_10), __pyx_kp_XMLSchemaError, "lxml.etree"); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[21]; __pyx_lineno = 4; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_5 = __Pyx_CreateClass(((PyObject *)__pyx_13), ((PyObject *)__pyx_10), __pyx_kp_XMLSchemaError, "lxml.etree"); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[21]; __pyx_lineno = 4; __pyx_clineno = __LINE__; goto __pyx_L1;}
 Py_DECREF(((PyObject *)__pyx_13)); __pyx_13 = 0;
-if (PyObject_SetAttr(__pyx_m, __pyx_kp_XMLSchemaError, __pyx_4) < 0) {__pyx_filename = __pyx_f[21]; __pyx_lineno = 4; __pyx_clineno = __LINE__; goto __pyx_L1;}
-Py_DECREF(__pyx_4); __pyx_4 = 0;
+if (PyObject_SetAttr(__pyx_m, __pyx_kp_XMLSchemaError, __pyx_5) < 0) {__pyx_filename = __pyx_f[21]; __pyx_lineno = 4; __pyx_clineno = __LINE__; goto __pyx_L1;}
+Py_DECREF(__pyx_5); __pyx_5 = 0;
 Py_DECREF(((PyObject *)__pyx_10)); __pyx_10 = 0;
 
 /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/xmlschema.pxi":9
@@ -121450,10 +121430,10 @@
  *     """
  */
 __pyx_8 = PyDict_New(); if (unlikely(!__pyx_8)) {__pyx_filename = __pyx_f[21]; __pyx_lineno = 9; __pyx_clineno = __LINE__; goto __pyx_L1;}
-__pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_XMLSchemaError); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[21]; __pyx_lineno = 9; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_XMLSchemaError); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[21]; __pyx_lineno = 9; __pyx_clineno = __LINE__; goto __pyx_L1;}
 __pyx_12 = PyTuple_New(1); if (unlikely(!__pyx_12)) {__pyx_filename = __pyx_f[21]; __pyx_lineno = 9; __pyx_clineno = __LINE__; goto __pyx_L1;}
-PyTuple_SET_ITEM(__pyx_12, 0, __pyx_3);
-__pyx_3 = 0;
+PyTuple_SET_ITEM(__pyx_12, 0, __pyx_4);
+__pyx_4 = 0;
 if (PyDict_SetItemString(((PyObject *)__pyx_8), "__doc__", __pyx_kp_125) < 0) {__pyx_filename = __pyx_f[21]; __pyx_lineno = 9; __pyx_clineno = __LINE__; goto __pyx_L1;}
 __pyx_9 = __Pyx_CreateClass(((PyObject *)__pyx_12), ((PyObject *)__pyx_8), __pyx_kp_XMLSchemaParseError, "lxml.etree"); if (unlikely(!__pyx_9)) {__pyx_filename = __pyx_f[21]; __pyx_lineno = 9; __pyx_clineno = __LINE__; goto __pyx_L1;}
 Py_DECREF(((PyObject *)__pyx_12)); __pyx_12 = 0;
@@ -121468,17 +121448,17 @@
  *     u"""Error while validating an XML document with an XML Schema.
  *     """
  */
-__pyx_5 = PyDict_New(); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[21]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_6 = PyDict_New(); if (unlikely(!__pyx_6)) {__pyx_filename = __pyx_f[21]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1;}
 __pyx_11 = __Pyx_GetName(__pyx_m, __pyx_kp_XMLSchemaError); if (unlikely(!__pyx_11)) {__pyx_filename = __pyx_f[21]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1;}
 __pyx_13 = PyTuple_New(1); if (unlikely(!__pyx_13)) {__pyx_filename = __pyx_f[21]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1;}
 PyTuple_SET_ITEM(__pyx_13, 0, __pyx_11);
 __pyx_11 = 0;
-if (PyDict_SetItemString(((PyObject *)__pyx_5), "__doc__", __pyx_kp_127) < 0) {__pyx_filename = __pyx_f[21]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1;}
-__pyx_4 = __Pyx_CreateClass(((PyObject *)__pyx_13), ((PyObject *)__pyx_5), __pyx_kp_126, "lxml.etree"); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[21]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1;}
+if (PyDict_SetItemString(((PyObject *)__pyx_6), "__doc__", __pyx_kp_127) < 0) {__pyx_filename = __pyx_f[21]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_5 = __Pyx_CreateClass(((PyObject *)__pyx_13), ((PyObject *)__pyx_6), __pyx_kp_126, "lxml.etree"); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[21]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1;}
 Py_DECREF(((PyObject *)__pyx_13)); __pyx_13 = 0;
-if (PyObject_SetAttr(__pyx_m, __pyx_kp_126, __pyx_4) < 0) {__pyx_filename = __pyx_f[21]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1;}
-Py_DECREF(__pyx_4); __pyx_4 = 0;
-Py_DECREF(((PyObject *)__pyx_5)); __pyx_5 = 0;
+if (PyObject_SetAttr(__pyx_m, __pyx_kp_126, __pyx_5) < 0) {__pyx_filename = __pyx_f[21]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1;}
+Py_DECREF(__pyx_5); __pyx_5 = 0;
+Py_DECREF(((PyObject *)__pyx_6)); __pyx_6 = 0;
 
 /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/schematron.pxi":4
  * cimport schematron
@@ -121488,10 +121468,10 @@
  *     """
  */
 __pyx_10 = PyDict_New(); if (unlikely(!__pyx_10)) {__pyx_filename = __pyx_f[22]; __pyx_lineno = 4; __pyx_clineno = __LINE__; goto __pyx_L1;}
-__pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_LxmlError); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[22]; __pyx_lineno = 4; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_LxmlError); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[22]; __pyx_lineno = 4; __pyx_clineno = __LINE__; goto __pyx_L1;}
 __pyx_12 = PyTuple_New(1); if (unlikely(!__pyx_12)) {__pyx_filename = __pyx_f[22]; __pyx_lineno = 4; __pyx_clineno = __LINE__; goto __pyx_L1;}
-PyTuple_SET_ITEM(__pyx_12, 0, __pyx_3);
-__pyx_3 = 0;
+PyTuple_SET_ITEM(__pyx_12, 0, __pyx_4);
+__pyx_4 = 0;
 if (PyDict_SetItemString(((PyObject *)__pyx_10), "__doc__", __pyx_kp_128) < 0) {__pyx_filename = __pyx_f[22]; __pyx_lineno = 4; __pyx_clineno = __LINE__; goto __pyx_L1;}
 __pyx_9 = __Pyx_CreateClass(((PyObject *)__pyx_12), ((PyObject *)__pyx_10), __pyx_kp_SchematronError, "lxml.etree"); if (unlikely(!__pyx_9)) {__pyx_filename = __pyx_f[22]; __pyx_lineno = 4; __pyx_clineno = __LINE__; goto __pyx_L1;}
 Py_DECREF(((PyObject *)__pyx_12)); __pyx_12 = 0;
@@ -121512,10 +121492,10 @@
 PyTuple_SET_ITEM(__pyx_13, 0, __pyx_11);
 __pyx_11 = 0;
 if (PyDict_SetItemString(((PyObject *)__pyx_8), "__doc__", __pyx_kp_130) < 0) {__pyx_filename = __pyx_f[22]; __pyx_lineno = 9; __pyx_clineno = __LINE__; goto __pyx_L1;}
-__pyx_4 = __Pyx_CreateClass(((PyObject *)__pyx_13), ((PyObject *)__pyx_8), __pyx_kp_129, "lxml.etree"); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[22]; __pyx_lineno = 9; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_5 = __Pyx_CreateClass(((PyObject *)__pyx_13), ((PyObject *)__pyx_8), __pyx_kp_129, "lxml.etree"); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[22]; __pyx_lineno = 9; __pyx_clineno = __LINE__; goto __pyx_L1;}
 Py_DECREF(((PyObject *)__pyx_13)); __pyx_13 = 0;
-if (PyObject_SetAttr(__pyx_m, __pyx_kp_129, __pyx_4) < 0) {__pyx_filename = __pyx_f[22]; __pyx_lineno = 9; __pyx_clineno = __LINE__; goto __pyx_L1;}
-Py_DECREF(__pyx_4); __pyx_4 = 0;
+if (PyObject_SetAttr(__pyx_m, __pyx_kp_129, __pyx_5) < 0) {__pyx_filename = __pyx_f[22]; __pyx_lineno = 9; __pyx_clineno = __LINE__; goto __pyx_L1;}
+Py_DECREF(__pyx_5); __pyx_5 = 0;
 Py_DECREF(((PyObject *)__pyx_8)); __pyx_8 = 0;
 
 /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/schematron.pxi":14
@@ -121525,17 +121505,17 @@
  *     u"""Error while validating an XML document with a Schematron schema.
  *     """
  */
-__pyx_5 = PyDict_New(); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[22]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1;}
-__pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_SchematronError); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[22]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_6 = PyDict_New(); if (unlikely(!__pyx_6)) {__pyx_filename = __pyx_f[22]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_SchematronError); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[22]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1;}
 __pyx_12 = PyTuple_New(1); if (unlikely(!__pyx_12)) {__pyx_filename = __pyx_f[22]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1;}
-PyTuple_SET_ITEM(__pyx_12, 0, __pyx_3);
-__pyx_3 = 0;
-if (PyDict_SetItemString(((PyObject *)__pyx_5), "__doc__", __pyx_kp_132) < 0) {__pyx_filename = __pyx_f[22]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1;}
-__pyx_9 = __Pyx_CreateClass(((PyObject *)__pyx_12), ((PyObject *)__pyx_5), __pyx_kp_131, "lxml.etree"); if (unlikely(!__pyx_9)) {__pyx_filename = __pyx_f[22]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1;}
+PyTuple_SET_ITEM(__pyx_12, 0, __pyx_4);
+__pyx_4 = 0;
+if (PyDict_SetItemString(((PyObject *)__pyx_6), "__doc__", __pyx_kp_132) < 0) {__pyx_filename = __pyx_f[22]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1;}
+__pyx_9 = __Pyx_CreateClass(((PyObject *)__pyx_12), ((PyObject *)__pyx_6), __pyx_kp_131, "lxml.etree"); if (unlikely(!__pyx_9)) {__pyx_filename = __pyx_f[22]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1;}
 Py_DECREF(((PyObject *)__pyx_12)); __pyx_12 = 0;
 if (PyObject_SetAttr(__pyx_m, __pyx_kp_131, __pyx_9) < 0) {__pyx_filename = __pyx_f[22]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1;}
 Py_DECREF(__pyx_9); __pyx_9 = 0;
-Py_DECREF(((PyObject *)__pyx_5)); __pyx_5 = 0;
+Py_DECREF(((PyObject *)__pyx_6)); __pyx_6 = 0;
 
 /* "/home/sbehnel/source/Python/lxml/lxml-2.1/src/lxml/public-api.pxi":153
  *     matcher._initTagMatch(tag)
@@ -121544,11 +121524,7 @@
  *     _Document doc, xmlNode* c_node, char* href, char* prefix) except NULL:
  *     if doc is None:
  */
-#if PY_MAJOR_VERSION < 3
 return;
-#else
-return __pyx_m;
-#endif
 __pyx_L1:;
 Py_XDECREF(__pyx_1);
 Py_XDECREF(__pyx_3);
@@ -121562,9 +121538,6 @@
 Py_XDECREF(__pyx_12);
 Py_XDECREF(__pyx_13);
 __Pyx_AddTraceback("lxml.etree");
-#if PY_MAJOR_VERSION >= 3
-return NULL;
-#endif
 }
 
 static const char *__pyx_filenames[] = {
only in patch2:
unchanged:
--- lxml-2.1.1.orig/src/lxml/lxml.etree.pyx
+++ lxml-2.1.1/src/lxml/lxml.etree.pyx
@@ -38,7 +38,7 @@
 cdef object BytesIO, StringIO
 try:
     from io import BytesIO, StringIO
-except ImportError:
+except (ImportError, AttributeError):
     from StringIO import StringIO, StringIO as BytesIO
 
 cdef object _elementpath