summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/python/python-pyasn1.inc1
-rw-r--r--meta/recipes-devtools/python/python3-pyasn1/0001-Fix-DeprecationWarning-__int__-returned-non-int-on-P.patch28
2 files changed, 29 insertions, 0 deletions
diff --git a/meta/recipes-devtools/python/python-pyasn1.inc b/meta/recipes-devtools/python/python-pyasn1.inc
index 6cbed0fcd5..1b941630e7 100644
--- a/meta/recipes-devtools/python/python-pyasn1.inc
+++ b/meta/recipes-devtools/python/python-pyasn1.inc
@@ -19,6 +19,7 @@ inherit ptest
19 19
20SRC_URI += " \ 20SRC_URI += " \
21 file://run-ptest \ 21 file://run-ptest \
22 file://0001-Fix-DeprecationWarning-__int__-returned-non-int-on-P.patch \
22" 23"
23 24
24RDEPENDS:${PN}-ptest += " \ 25RDEPENDS:${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 0000000000..30ac9a6684
--- /dev/null
+++ b/meta/recipes-devtools/python/python3-pyasn1/0001-Fix-DeprecationWarning-__int__-returned-non-int-on-P.patch
@@ -0,0 +1,28 @@
1From db8f1a7930c6b5826357646746337dafc983f953 Mon Sep 17 00:00:00 2001
2From: Ilya Etingof <etingof@gmail.com>
3Date: Sat, 21 Mar 2020 19:05:03 +0100
4Subject: [PATCH] Fix `DeprecationWarning: __int__ returned non-int` on Py3
5
6In `BitString.__int__()`
7Upstream-Status: Backport
8Signed-off-by: Yulong Liu <yulong.liu@windriver.com>
9---
10 pyasn1/type/univ.py | 2 +-
11 1 file changed, 1 insertion(+), 1 deletion(-)
12
13diff --git a/pyasn1/type/univ.py b/pyasn1/type/univ.py
14index 10924c3..488241f 100644
15--- a/pyasn1/type/univ.py
16+++ b/pyasn1/type/univ.py
17@@ -551,7 +551,7 @@ class BitString(base.SimpleAsn1Type):
18 return self.clone(SizedInteger(self._value >> count).setBitLength(max(0, len(self._value) - count)))
19
20 def __int__(self):
21- return self._value
22+ return int(self._value)
23
24 def __float__(self):
25 return float(self._value)
26--
272.25.1
28