Compare commits

..

No commits in common. "b3ef556a4b87526f0a2779406ceda958500cacb1" and "20192d3c9b340fb7341abe62d2b735bd8bdbc851" have entirely different histories.

5 changed files with 5 additions and 141 deletions

View File

@ -1,78 +0,0 @@
From e3012a702dea2b03830fe00a5e8f7a429bbc3f42 Mon Sep 17 00:00:00 2001
From: Serhiy Storchaka <storchaka@gmail.com>
Date: Mon, 22 Apr 2024 16:52:26 +0800
Subject: [PATCH] Fix test_elementtree with Expat 2.6.0
---
src/lxml/tests/test_elementtree.py | 48 ++++++++++++++++--------------
1 file changed, 25 insertions(+), 23 deletions(-)
diff --git a/src/lxml/tests/test_elementtree.py b/src/lxml/tests/test_elementtree.py
index 96426cb..d9cd47e 100644
--- a/src/lxml/tests/test_elementtree.py
+++ b/src/lxml/tests/test_elementtree.py
@@ -14,6 +14,7 @@ import copy
import io
import operator
import os
+import pyexpat
import re
import sys
import textwrap
@@ -4396,29 +4397,30 @@ class _XMLPullParserTest(unittest.TestCase):
self.assertEqual([(action, elem.tag) for action, elem in events],
expected)
- def test_simple_xml(self):
- for chunk_size in (None, 1, 5):
- #with self.subTest(chunk_size=chunk_size):
- parser = self.etree.XMLPullParser()
- self.assert_event_tags(parser, [])
- self._feed(parser, "<!-- comment -->\n", chunk_size)
- self.assert_event_tags(parser, [])
- self._feed(parser,
- "<root>\n <element key='value'>text</element",
- chunk_size)
- self.assert_event_tags(parser, [])
- self._feed(parser, ">\n", chunk_size)
- self.assert_event_tags(parser, [('end', 'element')])
- self._feed(parser, "<element>text</element>tail\n", chunk_size)
- self._feed(parser, "<empty-element/>\n", chunk_size)
- self.assert_event_tags(parser, [
- ('end', 'element'),
- ('end', 'empty-element'),
- ])
- self._feed(parser, "</root>\n", chunk_size)
- self.assert_event_tags(parser, [('end', 'root')])
- root = self._close_and_return_root(parser)
- self.assertEqual(root.tag, 'root')
+ def test_simple_xml(self, chunk_size=None):
+ parser = self.etree.XMLPullParser()
+ self.assert_event_tags(parser, [])
+ self._feed(parser, "<!-- comment -->\n", chunk_size)
+ self.assert_event_tags(parser, [])
+ self._feed(parser,
+ "<root>\n <element key='value'>text</element",
+ chunk_size)
+ self.assert_event_tags(parser, [])
+ self._feed(parser, ">\n", chunk_size)
+ self.assert_event_tags(parser, [('end', 'element')])
+ self._feed(parser, "<element>text</element>tail\n", chunk_size)
+ self._feed(parser, "<empty-element/>\n", chunk_size)
+ self.assert_event_tags(parser, [
+ ('end', 'element'),
+ ('end', 'empty-element'),
+ ])
+ self._feed(parser, "</root>\n", chunk_size)
+ self.assert_event_tags(parser, [('end', 'root')])
+ root = self._close_and_return_root(parser)
+ self.assertEqual(root.tag, 'root')
+
+ def test_simple_xml_chunk_22(self):
+ self.test_simple_xml(chunk_size=22)
def test_feed_while_iterating(self):
parser = self.etree.XMLPullParser()
--
2.33.0

View File

@ -1,32 +0,0 @@
From 1e096eeabcb6f3995c8e9da6f544e7f9f5ff5f08 Mon Sep 17 00:00:00 2001
From: zhuofeng <zhuofeng2@huawei.com>
Date: Wed, 9 Aug 2023 15:22:11 +0800
Subject: [PATCH] Skip failing test_iterparse_utf16_bom
---
src/lxml/tests/test_io.py | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/lxml/tests/test_io.py b/src/lxml/tests/test_io.py
index 8fac41d..2b5d0de 100644
--- a/src/lxml/tests/test_io.py
+++ b/src/lxml/tests/test_io.py
@@ -4,6 +4,7 @@ IO test cases that apply to both etree and ElementTree
import unittest
+from unittest import skip
import tempfile, gzip, os, os.path, gc, shutil
from .common_imports import (
@@ -305,6 +306,7 @@ class _IOTestCaseBase(HelperTestCase):
os.unlink(f.name)
self.assertEqual(utext, root.text)
+ @skip
def test_iterparse_utf16_bom(self):
utext = 'Søk på nettet'
uxml = '<?xml version="1.0" encoding="UTF-16"?><p>%s</p>' % utext
--
2.33.0

BIN
lxml-4.9.2.tar.gz Normal file

Binary file not shown.

Binary file not shown.

View File

@ -6,15 +6,12 @@ the simplicity of a native Python API, mostly compatible but superior to the wel
The latest release works with all CPython versions from 2.7 to 3.7.
Name: python-lxml
Version: 5.1.0
Release: 3
Version: 4.9.2
Release: 1
Summary: XML processing library combining libxml2/libxslt with the ElementTree API
License: BSD
URL: https://github.com/lxml/lxml
Source0: https://files.pythonhosted.org/packages/2b/b4/bbccb250adbee490553b6a52712c46c20ea1ba533a643f1424b27ffc6845/lxml-5.1.0.tar.gz
Patch0: Skip-failing-test_iterparse_utf16_bom.patch
Patch1: Fix-test_elementtree-with-Expat-2.6.0.patch
Source0: https://files.pythonhosted.org/packages/06/5a/e11cad7b79f2cf3dd2ff8f81fa8ca667e7591d3d8451768589996b65dec1/lxml-4.9.2.tar.gz
%description
%{_description}
@ -38,7 +35,7 @@ Provides: python3-lxml-doc
%{_description}
%prep
%autosetup -n lxml-%{version} -p1
%autosetup -n lxml-%{version}
find -type f -name '*.c' -print -delete
%build
@ -68,7 +65,7 @@ mv %{buildroot}/filelist.lst .
mv %{buildroot}/doclist.lst .
%check
make test
make test3
%files -n python3-lxml -f filelist.lst
%license doc/licenses/*.txt LICENSES.txt
@ -78,29 +75,6 @@ make test
%doc README.rst src/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/readme.txt
%changelog
* Wed Nov 06 2024 zhuofeng <zhuofeng2@huawei.com> - 5.1.0-3
- skip the failed test
* Tue Apr 23 2024 zhangzikang <zhangzikang@kylinos.cn> - 5.1.0-2
- Fix test_elementtree with Expat-2.6.0, resolve check error
* Wed Feb 07 2024 dongyuzhen <dongyuzhen@h-partners.com> - 5.1.0-1
- upgrade version to 5.1.0:
- some incorrect declarations were removed from ``python.pxd``
- built with Cython 3.0.7
- some redundant and long deprecated methods were removed
- character escaping in ``C14N2`` serialisation now uses a single pass over the text instead of searching for each unescaped character separately
- early support for Python 3.13a2 was added
- support for Python 2.7 and Python versions < 3.6 was removed
- parsing ASCII strings is slightly faster
- some bugs fixes
* Wed Aug 09 2023 zhuofeng <zhuofeng2@huawei.com> - 4.9.3-2
- sync fedara patch
* Wed Jul 12 2023 sunhui <sunhui@kylinos.cn> - 4.9.3-1
- Update package to version 4.9.3
* Wed Dec 14 2022 wangjunqi <wangjunqi@kylinos.cn> - 4.9.2-1
- Update package to version 4.9.2