diff options
author | Mark Asselstine <mark.asselstine@windriver.com> | 2017-12-04 14:00:44 -0500 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2017-12-22 19:43:55 -0800 |
commit | 80b3f2e8203b26d8424d2e86405293a1fc0e262b (patch) | |
tree | 1ec148fb989782f6ffa801d19bac245f2a7e8ca2 /meta-python/recipes-devtools/python/python-pyroute2/import-simplejson-as-json.patch | |
parent | 6b9cb0a7b0ff3142575ef1630b97b41a4c6cb5d7 (diff) | |
download | meta-openembedded-80b3f2e8203b26d8424d2e86405293a1fc0e262b.tar.gz |
python-pyroute2: uprev to v0.4.21 (from 0.3.22)
Drop the json<-->simplejson patch instead opting to depend on
python-json (part of core python libs). Beyond this the uprev is
straightforward.
Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-python/recipes-devtools/python/python-pyroute2/import-simplejson-as-json.patch')
-rw-r--r-- | meta-python/recipes-devtools/python/python-pyroute2/import-simplejson-as-json.patch | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/meta-python/recipes-devtools/python/python-pyroute2/import-simplejson-as-json.patch b/meta-python/recipes-devtools/python/python-pyroute2/import-simplejson-as-json.patch deleted file mode 100644 index d73da07d25..0000000000 --- a/meta-python/recipes-devtools/python/python-pyroute2/import-simplejson-as-json.patch +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | Upstream-Status: Inappropriate [wrong dependency] | ||
2 | |||
3 | Subject: [PATCH] import simplejson as json | ||
4 | |||
5 | At runtime python-pyroute2 tries to import json, but the module is not | ||
6 | available, import simplejson as json solve the issue. | ||
7 | |||
8 | Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br> | ||
9 | --- | ||
10 | pyroute2/netlink/rtnl/ifinfmsg.py | 2 +- | ||
11 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
12 | |||
13 | diff --git a/pyroute2/netlink/rtnl/ifinfmsg.py b/pyroute2/netlink/rtnl/ifinfmsg.py | ||
14 | index 4f14f25..55643eb 100644 | ||
15 | --- a/pyroute2/netlink/rtnl/ifinfmsg.py | ||
16 | +++ b/pyroute2/netlink/rtnl/ifinfmsg.py | ||
17 | @@ -1,5 +1,5 @@ | ||
18 | import os | ||
19 | -import json | ||
20 | +import simplejson as json | ||
21 | import errno | ||
22 | import select | ||
23 | import struct | ||
24 | -- | ||
25 | 2.1.4 | ||
26 | |||