# HG changeset patch # User Bob Ippolito <bob@redivi.com> # Date 1389026256 28800 # Mon Jan 06 08:37:36 2014 -0800 # Node ID 45bf5f9c8f132487876305521d3d07aa688c4c4b # Parent 0fe327bd94b196e9c2f0e92b7a4ed34d77a7559e update CHANGES.txt for v3.3.2 diff --git a/CHANGES.txt b/CHANGES.txt --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,3 +1,8 @@ +Version 3.3.2 released 2014-01-06 + +* Docstring fix for decoded string types + https://github.com/simplejson/simplejson/pull/82 + Version 3.3.1 released 2013-10-05 * JSONDecodeError exceptions can now be pickled diff --git a/conf.py b/conf.py --- a/conf.py +++ b/conf.py @@ -36,7 +36,7 @@ # General substitutions. project = 'simplejson' -copyright = '2013, Bob Ippolito' +copyright = '2014, Bob Ippolito' # The default replacements for |version| and |release|, also used in various # other places throughout the built documents. @@ -44,7 +44,7 @@ # The short X.Y version. version = '3.3' # The full version, including alpha/beta/rc tags. -release = '3.3.1' +release = '3.3.2' # There are two options for replacing |today|: either, you set today to some # non-false value, then it is used: diff --git a/setup.py b/setup.py --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ DistutilsPlatformError IS_PYPY = hasattr(sys, 'pypy_translation_info') -VERSION = '3.3.1' +VERSION = '3.3.2' DESCRIPTION = "Simple, fast, extensible JSON encoder/decoder for Python" with open('README.rst', 'r') as f: diff --git a/simplejson/__init__.py b/simplejson/__init__.py --- a/simplejson/__init__.py +++ b/simplejson/__init__.py @@ -98,7 +98,7 @@ Expecting property name: line 1 column 3 (char 2) """ from __future__ import absolute_import -__version__ = '3.3.1' +__version__ = '3.3.2' __all__ = [ 'dump', 'dumps', 'load', 'loads', 'JSONDecoder', 'JSONDecodeError', 'JSONEncoder',