diff options
author | Magnus Olsson <magnus@minimum.se> | 2014-12-05 11:03:46 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-12-31 10:19:00 +0000 |
commit | 554962b380cee1100faec80b6ee89a50c64715bc (patch) | |
tree | ef777188d103fa74cf9565da4026fb0213870db5 /scripts/contrib/python | |
parent | 6a2ff9b067c650eef4169dd7a9faef940fd6866a (diff) | |
download | poky-554962b380cee1100faec80b6ee89a50c64715bc.tar.gz |
python: add python-codecs runtime dependency for python-json
A piece of JSON initialization code that runs when you "import json"
tries to use the hex-decoder, thus breaks if you do not have
python-codecs installed. Example:
>>> import json
Traceback (most recent call last):
File "<stdin>", line 1, in <module>
File "/usr/lib/python2.7/json/__init__.py", line 108, in <module>
from .decoder import JSONDecoder
File "/usr/lib/python2.7/json/decoder.py", line 24, in <module>
NaN, PosInf, NegInf = _floatconstants()
File "/usr/lib/python2.7/json/decoder.py", line 18, in _floatconstants
_BYTES = '7FF80000000000007FF0000000000000'.decode('hex')
LookupError: no codec search functions registered: can't find encoding
This patch adds a runtime dependency on python-codecs for python-json and
re-generates the python manifests for Python v2.7. Solves [YOCTO #7020].
(From OE-Core rev: 90fd48144f146f455b18372a9b061314ab3a3857)
(From OE-Core rev: e726819bb2b5b960a50d2ae8d4c6fe85e70c99b7)
Signed-off-by: Magnus Olsson <magnus@minimum.se>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/contrib/python')
-rwxr-xr-x | scripts/contrib/python/generate-manifest-2.7.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/contrib/python/generate-manifest-2.7.py b/scripts/contrib/python/generate-manifest-2.7.py index 21b874f6cc..68c42b0a54 100755 --- a/scripts/contrib/python/generate-manifest-2.7.py +++ b/scripts/contrib/python/generate-manifest-2.7.py | |||
@@ -279,7 +279,7 @@ if __name__ == "__main__": | |||
279 | "lib-dynload/_socket.so lib-dynload/_io.so lib-dynload/_ssl.so lib-dynload/select.so lib-dynload/termios.so lib-dynload/cStringIO.so " + | 279 | "lib-dynload/_socket.so lib-dynload/_io.so lib-dynload/_ssl.so lib-dynload/select.so lib-dynload/termios.so lib-dynload/cStringIO.so " + |
280 | "pipes.* socket.* ssl.* tempfile.* StringIO.* io.* _pyio.*" ) | 280 | "pipes.* socket.* ssl.* tempfile.* StringIO.* io.* _pyio.*" ) |
281 | 281 | ||
282 | m.addPackage( "${PN}-json", "Python JSON support", "${PN}-core ${PN}-math ${PN}-re", | 282 | m.addPackage( "${PN}-json", "Python JSON support", "${PN}-core ${PN}-math ${PN}-re ${PN}-codecs", |
283 | "json lib-dynload/_json.so" ) # package | 283 | "json lib-dynload/_json.so" ) # package |
284 | 284 | ||
285 | m.addPackage( "${PN}-lang", "Python low-level language support", "${PN}-core", | 285 | m.addPackage( "${PN}-lang", "Python low-level language support", "${PN}-core", |