Update to lxml 3.6.0

Author: undingen

test/extra/lxml_patch.patch

@@ -22,18 +22,14 @@ def install_and_test_lxml():
     subprocess.check_call([PYTHON_EXE, "setup.py", "install"], cwd=CYTHON_DIR)
     subprocess.check_call([PYTHON_EXE, "-c", "import Cython"], cwd=CYTHON_DIR)
 
-    url = "https://pypi.python.org/packages/source/l/lxml/lxml-3.0.1.tar.gz"
+    url = "https://pypi.python.org/packages/source/l/lxml/lxml-3.6.0.tar.gz"
     subprocess.check_call(["wget", url], cwd=SRC_DIR)
-    subprocess.check_call(["tar", "-zxf", "lxml-3.0.1.tar.gz"], cwd=SRC_DIR)
-    LXML_DIR = os.path.abspath(os.path.join(SRC_DIR, "lxml-3.0.1"))
-
-    PATCH_FILE = os.path.abspath(os.path.join(os.path.dirname(__file__), "lxml_patch.patch"))
-    subprocess.check_call(["patch", "-p1", "--input=" + PATCH_FILE], cwd=LXML_DIR)
-    print "Applied lxml patch"
+    subprocess.check_call(["tar", "-zxf", "lxml-3.6.0.tar.gz"], cwd=SRC_DIR)
+    LXML_DIR = os.path.abspath(os.path.join(SRC_DIR, "lxml-3.6.0"))
 
     subprocess.check_call([PYTHON_EXE, "setup.py", "build_ext", "-i", "--with-cython"], cwd=LXML_DIR)
 
-    expected = [{'ran': 1381, 'failures': 1}]
+    expected = [{'ran': 1724, 'failures': 1, 'errors': 1}]
     run_test([PYTHON_EXE, "test.py"], cwd=LXML_DIR, expected=expected)
 
 create_virtenv(ENV_NAME, None, force_create = True)

test/extra/lxml_test.py

@@ -51,6 +51,28 @@ index 9cc38f0..ab05ad1 100644
  // originally copied from PyCFunction_Call() in CPython's Objects/methodobject.c
  // PyPy does not have this function
  static PyObject * __Pyx_CyFunction_Call(PyObject *func, PyObject *arg, PyObject *kw) {
+@@ -1143,7 +1145,9 @@
+ //////////////////// ClassMethod ////////////////////
+ 
+ static PyObject* __Pyx_Method_ClassMethod(PyObject *method) {
+-#if CYTHON_COMPILING_IN_PYPY
++// pyston change:
++// #if CYTHON_COMPILING_IN_PYPY
++#if 0 && CYTHON_COMPILING_IN_PYPY
+     if (PyObject_TypeCheck(method, &PyWrapperDescr_Type)) {
+         // cdef classes
+         return PyClassMethod_New(method);
+@@ -1152,7 +1156,9 @@
+     // It appears that PyMethodDescr_Type is not anywhere exposed in the Python/C API
+     static PyTypeObject *methoddescr_type = NULL;
+     if (methoddescr_type == NULL) {
+-       PyObject *meth = PyObject_GetAttrString((PyObject*)&PyList_Type, "append");
++       // Pyston change:
++       // PyObject *meth = PyObject_GetAttrString((PyObject*)&PyList_Type, "append");
++       PyObject *meth = PyObject_GetAttrString((PyObject*)&PyUnicode_Type, "split");
+        if (!meth) return NULL;
+        methoddescr_type = Py_TYPE(meth);
+        Py_DECREF(meth);
 diff --git a/Cython/Utility/Exceptions.c b/Cython/Utility/Exceptions.c
 index 354a776..567970d 100644
 --- a/Cython/Utility/Exceptions.c