summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Ippolito <bob@redivi.com>2013-10-31 03:33:17 -0700
committerBob Ippolito <bob@redivi.com>2013-10-31 03:33:17 -0700
commit41f336d71f81d283d7afb6c7d5d1b402eccb9782 (patch)
treed854ed42726dd4f9561ec37e9280c2b14c9fa51b
parentd59550cc9bf62bca93b52480536e94707e789579 (diff)
parenta7c32c1814da50d47b13102b5c84bec2e91058b5 (diff)
downloadsimplejson-41f336d71f81d283d7afb6c7d5d1b402eccb9782.tar.gz
Merge pull request #82 from JuhaS/patch-1
Documentation fix for decoded string types
-rw-r--r--simplejson/decoder.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/simplejson/decoder.py b/simplejson/decoder.py
index 5ccb450..38cb027 100644
--- a/simplejson/decoder.py
+++ b/simplejson/decoder.py
@@ -281,7 +281,7 @@ class JSONDecoder(object):
+---------------+-------------------+
| array | list |
+---------------+-------------------+
- | string | unicode |
+ | string | str, unicode |
+---------------+-------------------+
| number (int) | int, long |
+---------------+-------------------+