Skip to content

CLN: remove simplejson #29169

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 26, 2019
Merged

CLN: remove simplejson #29169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
baaf856
CLN: remove simplejson
simonjayhawkins Oct 22, 2019
224eb7d
Merge remote-tracking branch 'upstream/master' into simplejson
simonjayhawkins Oct 25, 2019
1713267
Merge remote-tracking branch 'upstream/master' into simplejson
simonjayhawkins Oct 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pandas/io/msgpack/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ def packb(o, **kwargs):
return Packer(**kwargs).pack(o)


# alias for compatibility to simplejson/marshal/pickle.
# alias for compatibility to json/marshal/pickle.
load = unpack
loads = unpackb

Expand Down
1 change: 0 additions & 1 deletion pandas/io/msgpack/_packer.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ cdef class Packer:

:param callable default:
Convert user type to builtin type that Packer supports.
See also simplejson's document.
:param str encoding:
Convert unicode to bytes with this encoding. (default: 'utf-8')
:param str unicode_errors:
Expand Down
3 changes: 1 addition & 2 deletions pandas/io/msgpack/_unpacker.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,11 +200,10 @@ cdef class Unpacker:
:param callable object_hook:
When specified, it should be callable.
Unpacker calls it with a dict argument after unpacking msgpack map.
(See also simplejson)

:param callable object_pairs_hook:
When specified, it should be callable. Unpacker calls it with a list
of key-value pairs after unpacking msgpack map. (See also simplejson)
of key-value pairs after unpacking msgpack map.

:param str encoding:
Encoding used for decoding msgpack raw.
Expand Down
6 changes: 1 addition & 5 deletions pandas/util/_print_versions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import codecs
import json
import locale
import os
import platform
Expand Down Expand Up @@ -105,11 +106,6 @@ def show_versions(as_json=False):
deps_blob.append((modname, ver))

if as_json:
try:
import json
except ImportError:
import simplejson as json

j = dict(system=dict(sys_info), dependencies=dict(deps_blob))

if as_json is True:
Expand Down