summaryrefslogtreecommitdiff
path: root/simplejson/encoder.py
diff options
context:
space:
mode:
authorBob Ippolito <bob@redivi.com>2012-03-29 11:59:33 -0700
committerBob Ippolito <bob@redivi.com>2012-03-29 11:59:33 -0700
commita19eb434a6733cf97dd5e4dd4721416743b840aa (patch)
tree1569f32629fd3659f850311bf6bd8f11b3dc984b /simplejson/encoder.py
parentfb26048e3983c098c8fa2d21009a6695cb128b5a (diff)
downloadsimplejson-a19eb434a6733cf97dd5e4dd4721416743b840aa.tar.gz
bump version to 2.5.0, add docs for item_sort_key
Diffstat (limited to 'simplejson/encoder.py')
-rw-r--r--simplejson/encoder.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/simplejson/encoder.py b/simplejson/encoder.py
index 1790e70..05dd05c 100644
--- a/simplejson/encoder.py
+++ b/simplejson/encoder.py
@@ -358,6 +358,8 @@ def _make_iterencode(markers, _default, _encoder, _indent, _floatstr,
str=str,
tuple=tuple,
):
+ if _item_sort_key and not callable(_item_sort_key):
+ raise TypeError("item_sort_key must be None or callable")
def _iterencode_list(lst, _current_indent_level):
if not lst: