Compare commits
No commits in common. "rawhide" and "f37" have entirely different histories.
6 changed files with 1664 additions and 1715 deletions
15
.gitignore
vendored
15
.gitignore
vendored
|
|
@ -58,18 +58,3 @@ lxml-2.2.7.tar.gz.asc
|
||||||
/lxml-4.6.3.tar.gz
|
/lxml-4.6.3.tar.gz
|
||||||
/lxml-4.7.1.tar.gz
|
/lxml-4.7.1.tar.gz
|
||||||
/lxml-4.9.1.tar.gz
|
/lxml-4.9.1.tar.gz
|
||||||
/lxml-4.9.2.tar.gz
|
|
||||||
/lxml-4.9.2-no-isoschematron.tar.gz
|
|
||||||
/lxml-4.9.2-no-isoschematron-rng.tar.gz
|
|
||||||
/lxml-4.9.3-no-isoschematron-rng.tar.gz
|
|
||||||
/lxml-4.9.4-no-isoschematron-rng.tar.gz
|
|
||||||
/lxml-5.1.0-no-isoschematron-rng.tar.gz
|
|
||||||
/lxml-5.2.0-no-isoschematron-rng.tar.gz
|
|
||||||
/lxml-5.2.1-no-isoschematron-rng.tar.gz
|
|
||||||
/lxml-5.3.0-no-isoschematron-rng.tar.gz
|
|
||||||
/lxml-5.3.1-no-isoschematron-rng.tar.gz
|
|
||||||
/lxml-5.3.2-no-isoschematron-rng.tar.gz
|
|
||||||
/lxml-5.4.0-no-isoschematron-rng.tar.gz
|
|
||||||
/lxml-6.0.0-no-isoschematron-rng.tar.gz
|
|
||||||
/lxml-6.0.1-no-isoschematron-rng.tar.gz
|
|
||||||
/lxml-6.0.2-no-isoschematron-rng.tar.gz
|
|
||||||
|
|
|
||||||
53
fix-namespace-count.patch
Normal file
53
fix-namespace-count.patch
Normal file
|
|
@ -0,0 +1,53 @@
|
||||||
|
From c742576c105f40fc8b754fcae56fee4aa35840a3 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Stefan Behnel <stefan_ml@behnel.de>
|
||||||
|
Date: Tue, 19 Jul 2022 08:25:20 +0200
|
||||||
|
Subject: [PATCH] Work around libxml2 bug in affected versions that failed to
|
||||||
|
reset the namespace count in the parser context.
|
||||||
|
|
||||||
|
See https://gitlab.gnome.org/GNOME/libxml2/-/issues/378
|
||||||
|
---
|
||||||
|
src/lxml/includes/xmlparser.pxd | 1 +
|
||||||
|
src/lxml/parser.pxi | 3 +++
|
||||||
|
src/lxml/tests/test_etree.py | 3 +--
|
||||||
|
3 files changed, 5 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/lxml/includes/xmlparser.pxd b/src/lxml/includes/xmlparser.pxd
|
||||||
|
index a196e34bd..45acfc846 100644
|
||||||
|
--- a/src/lxml/includes/xmlparser.pxd
|
||||||
|
+++ b/src/lxml/includes/xmlparser.pxd
|
||||||
|
@@ -144,6 +144,7 @@ cdef extern from "libxml/parser.h":
|
||||||
|
void* userData
|
||||||
|
int* spaceTab
|
||||||
|
int spaceMax
|
||||||
|
+ int nsNr
|
||||||
|
bint html
|
||||||
|
bint progressive
|
||||||
|
int inSubset
|
||||||
|
diff --git a/src/lxml/parser.pxi b/src/lxml/parser.pxi
|
||||||
|
index f5baf29b9..f0c8c6b64 100644
|
||||||
|
--- a/src/lxml/parser.pxi
|
||||||
|
+++ b/src/lxml/parser.pxi
|
||||||
|
@@ -569,6 +569,9 @@ cdef class _ParserContext(_ResolverContext):
|
||||||
|
self._c_ctxt.disableSAX = 0 # work around bug in libxml2
|
||||||
|
else:
|
||||||
|
xmlparser.xmlClearParserCtxt(self._c_ctxt)
|
||||||
|
+ # work around bug in libxml2 [2.9.10 .. 2.9.14]:
|
||||||
|
+ # https://gitlab.gnome.org/GNOME/libxml2/-/issues/378
|
||||||
|
+ self._c_ctxt.nsNr = 0
|
||||||
|
|
||||||
|
cdef int prepare(self, bint set_document_loader=True) except -1:
|
||||||
|
cdef int result
|
||||||
|
diff --git a/src/lxml/tests/test_etree.py b/src/lxml/tests/test_etree.py
|
||||||
|
index 8bf82c084..0339796d6 100644
|
||||||
|
--- a/src/lxml/tests/test_etree.py
|
||||||
|
+++ b/src/lxml/tests/test_etree.py
|
||||||
|
@@ -1491,8 +1491,7 @@ def test_walk_after_parse_failure(self):
|
||||||
|
# This would be the expected result, because there was no namespace
|
||||||
|
pass
|
||||||
|
else:
|
||||||
|
- # This is a bug in libxml2
|
||||||
|
- assert not ns, repr(ns)
|
||||||
|
+ assert False, "Found unexpected namespace '%s'" % ns
|
||||||
|
|
||||||
|
def test_itertext_comment_pi(self):
|
||||||
|
# https://bugs.launchpad.net/lxml/+bug/1844674
|
||||||
|
|
@ -1,28 +0,0 @@
|
||||||
#! /bin/bash -ex
|
|
||||||
|
|
||||||
# Download a release of lxml (if missing) and remove the isoschematron module from it
|
|
||||||
|
|
||||||
version=$1
|
|
||||||
|
|
||||||
if [ -z "${version}" ]; then
|
|
||||||
echo "Usage: $0 VERSION" >& 2
|
|
||||||
echo "" >& 2
|
|
||||||
echo "example: $0 4.9.2" >& 2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
versionedname=lxml-${version}
|
|
||||||
orig_archive=${versionedname}.tar.gz
|
|
||||||
new_archive=${versionedname}-no-isoschematron-rng.tar.gz
|
|
||||||
|
|
||||||
if [ ! -e ${orig_archive} ]; then
|
|
||||||
wget -N https://files.pythonhosted.org/packages/source/l/lxml/${orig_archive}
|
|
||||||
fi
|
|
||||||
|
|
||||||
deleted_directory=lxml-${version}/src/lxml/isoschematron/resources/rng
|
|
||||||
|
|
||||||
# tar --delete does not operate on compressed archives, so do
|
|
||||||
# gz decompression explicitly
|
|
||||||
gzip --decompress ${orig_archive}
|
|
||||||
tar -v --delete -f ${orig_archive//.gz} ${deleted_directory}
|
|
||||||
gzip -cf ${orig_archive//.gz} > ${new_archive}
|
|
||||||
1639
python-lxml.spec
1639
python-lxml.spec
File diff suppressed because it is too large
Load diff
2
sources
2
sources
|
|
@ -1 +1 @@
|
||||||
SHA512 (lxml-6.0.2-no-isoschematron-rng.tar.gz) = dc89f75c3a3c828a46bcb2eefbebe8f98ce8072b9fb66f8ef81edbf2babed74e4c54e26392603319d60ab3bfab6a4795eedc85b28efba815797d43d53aae4060
|
SHA512 (lxml-4.9.1.tar.gz) = d7ec55c7db2c63a716ca5f4d833706d90fc76c944885e010fcdb96786bcfe796994e438450cf4e8e6e75d702e21fb16971f28f854d7a1f76c34e4ae315414d84
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue