fix compatibility with python 2.6.x (#1216)

Signed-off-by: zhang-liang-pengkun <zhangliangpengkun@xfusion.com>
This commit is contained in:
zhang-liang-pengkun 2023-12-27 17:39:50 +08:00
parent 2a07055558
commit 7c336a95b7
2 changed files with 30 additions and 1 deletions

View File

@ -0,0 +1,25 @@
From 7618de9683684811402f50b08ca3f3e979774e72 Mon Sep 17 00:00:00 2001
From: Dan Vinakovsky <dvinak@gmail.com>
Date: Mon, 12 Feb 2018 18:29:34 -0500
Subject: [PATCH] fix compatibility with python 2.6.x (#1216)
---
psutil/_pswindows.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/psutil/_pswindows.py b/psutil/_pswindows.py
index b6c58c93..0eb4b14f 100644
--- a/psutil/_pswindows.py
+++ b/psutil/_pswindows.py
@@ -200,7 +200,7 @@ def py2_strencode(s):
if isinstance(s, str):
return s
else:
- return s.encode(ENCODING, errors=ENCODING_ERRS)
+ return s.encode(ENCODING, ENCODING_ERRS)
# =====================================================================
--
2.39.0.windows.2

View File

@ -1,6 +1,6 @@
Name: python-psutil
Version: 5.4.3
Release: 11
Release: 12
Summary: A library for retrieving information on running processes and system utilization in Python
License: BSD
URL: https://github.com/giampaolo/psutil
@ -10,6 +10,7 @@ Patch0001: CVE-2019-18874-1.patch
Patch0002: CVE-2019-18874-2.patch
Patch0003: 0001-Fix-1354-Linux-disk_io_counters-fails-on-Linux-kerne.patch
Patch0004: 0002-Pass-python_requires-argument-to-setuptools-1208.patch
Patch0005: 0003-fix-compatibility-with-python-2.6.x-1216.patch
BuildRequires: gcc python2-devel python3-devel procps-ng python2-mock python3-mock python2-ipaddress
@ -73,6 +74,9 @@ done
%{python3_sitearch}/*.egg-info
%changelog
* Wed Dec 27 2023 zhangliangpengkun<zhangliangpengkun@xfusion.com> - 5.4.3-12
- fix compatibility with python 2.6.x
* Thu Dec 21 2023 zhangliangpengkun<zhangliangpengkun@xfusion.com> - 5.4.3-11
- Pass python_requires argument to setuptools (#1208)