xcbgen: Use xml.etree.ElementTree for Python >= 3.3.
Signed-off-by: zhang-liang-pengkun <zhangliangpengkun@xfusion.com>
This commit is contained in:
parent
c8e7f95cf3
commit
c7eb2a89f6
53
0005-xcbgen-Use-xml.etree.ElementTree-for-Python-3.3.patch
Normal file
53
0005-xcbgen-Use-xml.etree.ElementTree-for-Python-3.3.patch
Normal file
@ -0,0 +1,53 @@
|
|||||||
|
From 029d5b5d705a27a9bb16fb7fb9b0d2b03dab424a Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@fedoraproject.org>
|
||||||
|
Date: Thu, 4 Jun 2020 20:48:51 +0200
|
||||||
|
Subject: [PATCH] xcbgen: Use xml.etree.ElementTree for Python >= 3.3.
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
In commit 7d58eed95f796fc764741d7549ee2214bbbcc64c we started
|
||||||
|
to use xml.etree.ElementTree for Python >= 3.9. In fact the
|
||||||
|
xml.etree.cElementTree module has already been deprecated
|
||||||
|
since Python 3.3.
|
||||||
|
|
||||||
|
Given this fact, we should start to use the xml.etree.ElementTree
|
||||||
|
module beginning with Python 3.3.
|
||||||
|
|
||||||
|
See: https://github.com/python/cpython/commit/a72a98f24a19928e31dcc4cab2cd2ad0f1846e11
|
||||||
|
|
||||||
|
Signed-off-by: Björn Esser <besser82@fedoraproject.org>
|
||||||
|
---
|
||||||
|
xcbgen/matcher.py | 2 +-
|
||||||
|
xcbgen/state.py | 2 +-
|
||||||
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/xcbgen/matcher.py b/xcbgen/matcher.py
|
||||||
|
index a13ef28..0d57685 100644
|
||||||
|
--- a/xcbgen/matcher.py
|
||||||
|
+++ b/xcbgen/matcher.py
|
||||||
|
@@ -9,7 +9,7 @@ we do not create a new type object, we just record the existing one under a new
|
||||||
|
from os.path import join
|
||||||
|
from sys import version_info
|
||||||
|
|
||||||
|
-if version_info[:2] >= (3, 9):
|
||||||
|
+if version_info[:2] >= (3, 3):
|
||||||
|
from xml.etree.ElementTree import parse
|
||||||
|
else:
|
||||||
|
from xml.etree.cElementTree import parse
|
||||||
|
diff --git a/xcbgen/state.py b/xcbgen/state.py
|
||||||
|
index 3b7eeb4..ffbfc14 100644
|
||||||
|
--- a/xcbgen/state.py
|
||||||
|
+++ b/xcbgen/state.py
|
||||||
|
@@ -4,7 +4,7 @@ This module contains the namespace class and the singleton module class.
|
||||||
|
from os.path import dirname, basename
|
||||||
|
from sys import version_info
|
||||||
|
|
||||||
|
-if version_info[:2] >= (3, 9):
|
||||||
|
+if version_info[:2] >= (3, 3):
|
||||||
|
from xml.etree.ElementTree import parse
|
||||||
|
else:
|
||||||
|
from xml.etree.cElementTree import parse
|
||||||
|
--
|
||||||
|
2.39.0.windows.2
|
||||||
|
|
||||||
@ -1,7 +1,7 @@
|
|||||||
%define debug_package %{nil}
|
%define debug_package %{nil}
|
||||||
Name: xcb-proto
|
Name: xcb-proto
|
||||||
Version: 1.14
|
Version: 1.14
|
||||||
Release: 6
|
Release: 7
|
||||||
Summary: XCB protocol descriptions
|
Summary: XCB protocol descriptions
|
||||||
License: MIT
|
License: MIT
|
||||||
URL: https://gitlab.freedesktop.org/xorg/proto/xcbproto/
|
URL: https://gitlab.freedesktop.org/xorg/proto/xcbproto/
|
||||||
@ -10,6 +10,7 @@ Patch01: 0001-Parse-a-field-s-enum-correctly.patch
|
|||||||
Patch02: 0002-xcbgen-Use-math.gcd-for-Python-3.5.patch
|
Patch02: 0002-xcbgen-Use-math.gcd-for-Python-3.5.patch
|
||||||
Patch03: 0003-xcbgen-xml.etree.cElementTree-has-been-dropped-in-Py.patch
|
Patch03: 0003-xcbgen-xml.etree.cElementTree-has-been-dropped-in-Py.patch
|
||||||
Patch04: 0004-xfixes-Add-ClientDisconnectMode.patch
|
Patch04: 0004-xfixes-Add-ClientDisconnectMode.patch
|
||||||
|
Patch05: 0005-xcbgen-Use-xml.etree.ElementTree-for-Python-3.3.patch
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
BuildRequires: python3-devel
|
BuildRequires: python3-devel
|
||||||
@ -40,6 +41,9 @@ export PYTHON="python3"
|
|||||||
%{python3_sitelib}/xcbgen
|
%{python3_sitelib}/xcbgen
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Dec 26 2023 zhangliangpengkun<zhangliangpengkun@xfusion.com> - 1.14-7
|
||||||
|
- xcbgen: Use xml.etree.ElementTree for Python >= 3.3.
|
||||||
|
|
||||||
* Tue Dec 05 2023 zhangliangpengkun<zhangliangpengkun@xfusion.com> - 1.14-6
|
* Tue Dec 05 2023 zhangliangpengkun<zhangliangpengkun@xfusion.com> - 1.14-6
|
||||||
- xfixes: Add ClientDisconnectMode
|
- xfixes: Add ClientDisconnectMode
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user