summaryrefslogtreecommitdiffstats
path: root/recipes-networking/openvswitch/openvswitch-git/0006-Python3-compatibility-math-error-compatibility.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-networking/openvswitch/openvswitch-git/0006-Python3-compatibility-math-error-compatibility.patch')
-rw-r--r--recipes-networking/openvswitch/openvswitch-git/0006-Python3-compatibility-math-error-compatibility.patch54
1 files changed, 0 insertions, 54 deletions
diff --git a/recipes-networking/openvswitch/openvswitch-git/0006-Python3-compatibility-math-error-compatibility.patch b/recipes-networking/openvswitch/openvswitch-git/0006-Python3-compatibility-math-error-compatibility.patch
deleted file mode 100644
index c53502b5..00000000
--- a/recipes-networking/openvswitch/openvswitch-git/0006-Python3-compatibility-math-error-compatibility.patch
+++ /dev/null
@@ -1,54 +0,0 @@
1From 7f542122d62b20d11198bfdb0f2c6a460261b5e7 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: math error compatibility
5
6Commit 3fa5aa4294377e0f35267936d0c5caea3e61db48 from
7https://github.com/openvswitch/ovs.git
8
9The way math is handled with typing is completely different in python3.
10
11% python2<<EOF
12x=10
13y=8
14print((x + (y - 1)) / y * y)
15EOF
1616
17
18python3<<EOF
19x=10
20y=8
21print((x + (y - 1)) / y * y)
22EOF
2317.0
24
25So we need to force an integer for the round function as follows and
26maintain compatibility with python2.
27
28python3<<EOF
29x=10
30y=8
31print(int((x + (y - 1)) / y) * y)
32EOF
3316
34
35Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
36Signed-off-by: Ben Pfaff <blp@ovn.org>
37
38---
39 build-aux/extract-ofp-actions | 2 +-
40 1 file changed, 1 insertion(+), 1 deletion(-)
41
42diff --git a/build-aux/extract-ofp-actions b/build-aux/extract-ofp-actions
43index c7858bd..4d05ef9 100755
44--- a/build-aux/extract-ofp-actions
45+++ b/build-aux/extract-ofp-actions
46@@ -35,7 +35,7 @@ line = ""
47 arg_structs = set()
48
49 def round_up(x, y):
50- return (x + (y - 1)) / y * y
51+ return int((x + (y - 1)) / y) * y
52
53 def open_file(fn):
54 global file_name