From: Yulong (Kevin) Liu <Yulong.Liu@windriver.com>
Date: Wed, 15 Jun 2022 19:41:27 +0000 (-0700)
Subject: python3-pyasn1: Eliminated ptest deprecation warnings
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~3847
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ac674d95820137306e7c71f4275d92cf4fedf39d;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

python3-pyasn1: Eliminated ptest deprecation warnings

Eliminated the ptest deprecation warnings for the error:
    DeprecationWarning: _int_ returned non-int (type SizedInteger).
    The ability to return an instance of a strict subclass of int is deprecated,
    and may be removed in a future version of Python.
       return SizedInteger(value).setBitLength(len(value))

Patch from git upstream repo:
   https://github.com/etingof/pyasn1/commit/db8f1a7930c6b5826357646746337dafc983f953

Signed-off-by: Yulong (Kevin) Liu <yulong.liu@windriver.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-devtools/python/python-pyasn1.inc b/meta/recipes-devtools/python/python-pyasn1.inc
index 6cbed0fcd57..1b941630e72 100644
--- a/meta/recipes-devtools/python/python-pyasn1.inc
+++ b/meta/recipes-devtools/python/python-pyasn1.inc
@@ -19,6 +19,7 @@ inherit ptest
 
 SRC_URI += " \
 	file://run-ptest \
+	file://0001-Fix-DeprecationWarning-__int__-returned-non-int-on-P.patch \
 "
 
 RDEPENDS:${PN}-ptest += " \
diff --git a/meta/recipes-devtools/python/python3-pyasn1/0001-Fix-DeprecationWarning-__int__-returned-non-int-on-P.patch b/meta/recipes-devtools/python/python3-pyasn1/0001-Fix-DeprecationWarning-__int__-returned-non-int-on-P.patch
new file mode 100644
index 00000000000..30ac9a66843
--- /dev/null
+++ b/meta/recipes-devtools/python/python3-pyasn1/0001-Fix-DeprecationWarning-__int__-returned-non-int-on-P.patch
@@ -0,0 +1,28 @@
+From db8f1a7930c6b5826357646746337dafc983f953 Mon Sep 17 00:00:00 2001
+From: Ilya Etingof <etingof@gmail.com>
+Date: Sat, 21 Mar 2020 19:05:03 +0100
+Subject: [PATCH] Fix `DeprecationWarning: __int__ returned non-int` on Py3
+
+In `BitString.__int__()`
+Upstream-Status: Backport
+Signed-off-by: Yulong Liu <yulong.liu@windriver.com>
+---
+ pyasn1/type/univ.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pyasn1/type/univ.py b/pyasn1/type/univ.py
+index 10924c3..488241f 100644
+--- a/pyasn1/type/univ.py
++++ b/pyasn1/type/univ.py
+@@ -551,7 +551,7 @@ class BitString(base.SimpleAsn1Type):
+         return self.clone(SizedInteger(self._value >> count).setBitLength(max(0, len(self._value) - count)))
+ 
+     def __int__(self):
+-        return self._value
++        return int(self._value)
+ 
+     def __float__(self):
+         return float(self._value)
+-- 
+2.25.1
+