summaryrefslogtreecommitdiffstats
path: root/recipes-networking/openvswitch/openvswitch-git/0005-Python3-compatibility-fix-integer-problems.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-networking/openvswitch/openvswitch-git/0005-Python3-compatibility-fix-integer-problems.patch')
-rw-r--r--recipes-networking/openvswitch/openvswitch-git/0005-Python3-compatibility-fix-integer-problems.patch49
1 files changed, 0 insertions, 49 deletions
diff --git a/recipes-networking/openvswitch/openvswitch-git/0005-Python3-compatibility-fix-integer-problems.patch b/recipes-networking/openvswitch/openvswitch-git/0005-Python3-compatibility-fix-integer-problems.patch
deleted file mode 100644
index d6f93646..00000000
--- a/recipes-networking/openvswitch/openvswitch-git/0005-Python3-compatibility-fix-integer-problems.patch
+++ /dev/null
@@ -1,49 +0,0 @@
1From d22c7f1c6ade82a0cd646cfcd8df9adda6cd1ad6 Mon Sep 17 00:00:00 2001
2From: Jason Wessel <jason.wessel@windriver.com>
3Date: Thu, 29 Jun 2017 20:33:23 -0700
4Subject: [PATCH] Python3 compatibility: fix integer problems
5
6Commit fa145f1a53943243f94a32ce98525db8494b0052 from
7https://github.com/openvswitch/ovs.git
8
9In python3 maxint is not defined, but maxsize is defined in both
10python2 and python3.
11
12The put_text() will not automatically use a value which came in as
13float due to a pior math function and python3 will throw an exception.
14The simple answer is to convert it with int() and move on.
15
16Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
17Signed-off-by: Ben Pfaff <blp@ovn.org>
18
19---
20 ovsdb/ovsdb-idlc.in | 2 +-
21 python/build/nroff.py | 2 ++
22 2 files changed, 3 insertions(+), 1 deletion(-)
23
24diff --git a/ovsdb/ovsdb-idlc.in b/ovsdb/ovsdb-idlc.in
25index b70a599..3645275 100755
26--- a/ovsdb/ovsdb-idlc.in
27+++ b/ovsdb/ovsdb-idlc.in
28@@ -358,7 +358,7 @@ static void
29 print(" %s" % type.value.initCDefault(valueVar, type.n_min == 0))
30 print(" }")
31 else:
32- if type.n_max != sys.maxint:
33+ if type.n_max != sys.maxsize:
34 print(" size_t n = MIN(%d, datum->n);" % type.n_max)
35 nMax = "n"
36 else:
37diff --git a/python/build/nroff.py b/python/build/nroff.py
38index c23837f..401f699 100644
39--- a/python/build/nroff.py
40+++ b/python/build/nroff.py
41@@ -148,6 +148,8 @@ def fatal(msg):
42
43
44 def put_text(text, x, y, s):
45+ x = int(x)
46+ y = int(y)
47 extend = x + len(s) - len(text[y])
48 if extend > 0:
49 text[y] += ' ' * extend