diff options
author | Bob Ippolito <bob@redivi.com> | 2013-02-21 14:19:08 -0800 |
---|---|---|
committer | Bob Ippolito <bob@redivi.com> | 2013-02-21 14:19:08 -0800 |
commit | 104b40fcf6aa39d9ba7b240c3c528d1f85e86ef2 (patch) | |
tree | 3cf08092fb2b95376a2b93f88e400c98c53872d8 /simplejson/__init__.py | |
parent | 44d7709a31f3a19f3d465411585ebb7be7fa2295 (diff) | |
download | simplejson-104b40fcf6aa39d9ba7b240c3c528d1f85e86ef2.tar.gz |
improve truncated input error messages, use JSONDecodeError instead of StopIteration (#61)
Diffstat (limited to 'simplejson/__init__.py')
-rw-r--r-- | simplejson/__init__.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/simplejson/__init__.py b/simplejson/__init__.py index 5574457..a908826 100644 --- a/simplejson/__init__.py +++ b/simplejson/__init__.py @@ -99,7 +99,7 @@ Using simplejson.tool from the shell to validate and pretty-print:: Expecting property name: line 1 column 3 (char 2) """ from __future__ import absolute_import -__version__ = '3.0.9' +__version__ = '3.1.0' __all__ = [ 'dump', 'dumps', 'load', 'loads', 'JSONDecoder', 'JSONDecodeError', 'JSONEncoder', @@ -110,7 +110,8 @@ __author__ = 'Bob Ippolito <bob@redivi.com>' from decimal import Decimal -from .decoder import JSONDecoder, JSONDecodeError +from .scanner import JSONDecodeError +from .decoder import JSONDecoder from .encoder import JSONEncoder, JSONEncoderForHTML def _import_OrderedDict(): import collections |