summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Ippolito <bob@redivi.com>2014-01-06 08:37:36 -0800
committerBob Ippolito <bob@redivi.com>2014-01-06 08:37:36 -0800
commit7d4ea580816a52fb2d762464cdf66108956abdc2 (patch)
tree74cea0a15c71e61a9a523a2067972c10570e35dd
parent41f336d71f81d283d7afb6c7d5d1b402eccb9782 (diff)
downloadsimplejson-7d4ea580816a52fb2d762464cdf66108956abdc2.tar.gz
update CHANGES.txt for v3.3.2v3.3.2
-rw-r--r--CHANGES.txt5
-rw-r--r--conf.py4
-rw-r--r--setup.py2
-rw-r--r--simplejson/__init__.py2
4 files changed, 9 insertions, 4 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 618eff1..5f92ccc 100644
--- 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
index cbb764c..56dfa7b 100644
--- a/conf.py
+++ b/conf.py
@@ -36,7 +36,7 @@ master_doc = 'index'
# 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 @@ copyright = '2013, Bob Ippolito'
# 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
index f5068d3..6f2591a 100644
--- a/setup.py
+++ b/setup.py
@@ -8,7 +8,7 @@ from distutils.errors import CCompilerError, DistutilsExecError, \
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
index 759a86d..4426a55 100644
--- a/simplejson/__init__.py
+++ b/simplejson/__init__.py
@@ -98,7 +98,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.3.1'
+__version__ = '3.3.2'
__all__ = [
'dump', 'dumps', 'load', 'loads',
'JSONDecoder', 'JSONDecodeError', 'JSONEncoder',