Skip to content

Commit

Permalink
CLN: remove simplejson (#29169)
Browse files Browse the repository at this point in the history
  • Loading branch information
simonjayhawkins authored Oct 26, 2019
1 parent a38a004 commit 953757a
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 9 deletions.
2 changes: 1 addition & 1 deletion pandas/io/msgpack/__init__.py
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
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
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
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

0 comments on commit 953757a

Please sign in to comment.