!22 [sync] PR-21: Remove usage of 'U' mode bit for opening files in python 3.11
From: @openeuler-sync-bot Reviewed-by: @liangkeming Signed-off-by: @liangkeming
This commit is contained in:
commit
8aad41571a
53
Remove-usage-of-U-mode-bit-for-opening-files-in-pyth.patch
Normal file
53
Remove-usage-of-U-mode-bit-for-opening-files-in-pyth.patch
Normal file
@ -0,0 +1,53 @@
|
|||||||
|
From 328c58967dce8be426f9208ba7717ab5afc2c4f3 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Daan De Meyer <daan.j.demeyer@gmail.com>
|
||||||
|
Date: Mon, 11 Jul 2022 00:56:28 +0200
|
||||||
|
Subject: [PATCH] Remove usage of 'U' mode bit for opening files in python
|
||||||
|
|
||||||
|
The 'U' mode bit is removed in python 3.11. It has been
|
||||||
|
deprecated for a long time. The 'U' mode bit has no effect
|
||||||
|
so this change doesn't change any behavior.
|
||||||
|
|
||||||
|
See https://docs.python.org/3.11/whatsnew/3.11.html#changes-in-the-python-api
|
||||||
|
---
|
||||||
|
waflib/ConfigSet.py | 2 +-
|
||||||
|
waflib/Context.py | 4 ++--
|
||||||
|
2 files changed, 3 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/waflib/ConfigSet.py b/waflib/ConfigSet.py
|
||||||
|
index b300bb56..84736c9c 100644
|
||||||
|
--- a/waflib/ConfigSet.py
|
||||||
|
+++ b/waflib/ConfigSet.py
|
||||||
|
@@ -312,7 +312,7 @@ class ConfigSet(object):
|
||||||
|
:type filename: string
|
||||||
|
"""
|
||||||
|
tbl = self.table
|
||||||
|
- code = Utils.readf(filename, m='rU')
|
||||||
|
+ code = Utils.readf(filename, m='r')
|
||||||
|
for m in re_imp.finditer(code):
|
||||||
|
g = m.group
|
||||||
|
tbl[g(2)] = eval(g(3))
|
||||||
|
diff --git a/waflib/Context.py b/waflib/Context.py
|
||||||
|
index 9fee3fa1..761b521f 100644
|
||||||
|
--- a/waflib/Context.py
|
||||||
|
+++ b/waflib/Context.py
|
||||||
|
@@ -266,7 +266,7 @@ class Context(ctx):
|
||||||
|
cache[node] = True
|
||||||
|
self.pre_recurse(node)
|
||||||
|
try:
|
||||||
|
- function_code = node.read('rU', encoding)
|
||||||
|
+ function_code = node.read('r', encoding)
|
||||||
|
exec(compile(function_code, node.abspath(), 'exec'), self.exec_dict)
|
||||||
|
finally:
|
||||||
|
self.post_recurse(node)
|
||||||
|
@@ -662,7 +662,7 @@ def load_module(path, encoding=None):
|
||||||
|
|
||||||
|
module = imp.new_module(WSCRIPT_FILE)
|
||||||
|
try:
|
||||||
|
- code = Utils.readf(path, m='rU', encoding=encoding)
|
||||||
|
+ code = Utils.readf(path, m='r', encoding=encoding)
|
||||||
|
except EnvironmentError:
|
||||||
|
raise Errors.WafError('Could not read the file %r' % path)
|
||||||
|
|
||||||
|
--
|
||||||
|
2.39.1
|
||||||
|
|
||||||
@ -2,12 +2,13 @@
|
|||||||
|
|
||||||
Name: jack-audio-connection-kit
|
Name: jack-audio-connection-kit
|
||||||
Version: 1.9.14
|
Version: 1.9.14
|
||||||
Release: 3
|
Release: 4
|
||||||
Summary: A professional sound server
|
Summary: A professional sound server
|
||||||
License: GPL-2.0 and GPL-2.0+ and LGPL-2.1+ and GPL-3.0+
|
License: GPL-2.0 and GPL-2.0+ and LGPL-2.1+ and GPL-3.0+
|
||||||
URL: http://github.com/jackaudio/jack2
|
URL: http://github.com/jackaudio/jack2
|
||||||
Source0: https://github.com/jackaudio/jack2/releases/download/v%{version}/jack2-%{version}.tar.gz
|
Source0: https://github.com/jackaudio/jack2/releases/download/v%{version}/jack2-%{version}.tar.gz
|
||||||
Patch0: %{name}-doxygen.patch
|
Patch0: %{name}-doxygen.patch
|
||||||
|
Patch1: Remove-usage-of-U-mode-bit-for-opening-files-in-pyth.patch
|
||||||
|
|
||||||
BuildRequires: alsa-lib-devel dbus-devel doxygen expat-devel gcc-c++ libffado-devel libsamplerate-devel libdb-devel < 6.0.20
|
BuildRequires: alsa-lib-devel dbus-devel doxygen expat-devel gcc-c++ libffado-devel libsamplerate-devel libdb-devel < 6.0.20
|
||||||
BuildRequires: libsndfile-devel ncurses-devel opus-devel pkgconfig python3 readline-devel
|
BuildRequires: libsndfile-devel ncurses-devel opus-devel pkgconfig python3 readline-devel
|
||||||
@ -90,6 +91,9 @@ exit 0
|
|||||||
%exclude %{_mandir}/man1/jack_impulse_grabber.1*
|
%exclude %{_mandir}/man1/jack_impulse_grabber.1*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Aug 16 2023 chenchen <chen_aka_jan@163.com> - 1.9.14-4
|
||||||
|
- Remove usage of 'U' mode bit for opening files in python 3.11
|
||||||
|
|
||||||
* Fri Oct 22 2021 Ge Wang <wangge20@huawei.com> - 1.9.14-3
|
* Fri Oct 22 2021 Ge Wang <wangge20@huawei.com> - 1.9.14-3
|
||||||
- Fix groupname is not a valid name error
|
- Fix groupname is not a valid name error
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user