summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Ippolito <bob@redivi.com>2014-10-24 08:14:19 -0700
committerBob Ippolito <bob@redivi.com>2014-10-24 08:14:19 -0700
commitd52cd59d28766c72314537e2a087665b8b54fa9b (patch)
treed34fe1fed7a33ccc140476e2853e3c346cbfd509
parent99d3082b8edef1e6b43e2a3971e7cebf2cde6608 (diff)
downloadsimplejson-d52cd59d28766c72314537e2a087665b8b54fa9b.tar.gz
update CHANGES and bump version to v3.6.5v3.6.5
-rw-r--r--CHANGES.txt6
-rw-r--r--conf.py2
-rw-r--r--setup.py2
-rw-r--r--simplejson/__init__.py2
4 files changed, 9 insertions, 3 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index bd6d978..76b7d78 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,9 @@
+Version 3.6.5 released 2014-10-24
+
+* Importing bug fix for reference leak when an error occurs during
+ dict encoding
+ https://github.com/simplejson/simplejson/issues/109
+
Version 3.6.4 released 2014-09-29
* Important bug fix for dump when only sort_keys is set
diff --git a/conf.py b/conf.py
index 5d44941..a233b94 100644
--- a/conf.py
+++ b/conf.py
@@ -44,7 +44,7 @@ copyright = '2014, Bob Ippolito'
# The short X.Y version.
version = '3.6'
# The full version, including alpha/beta/rc tags.
-release = '3.6.4'
+release = '3.6.5'
# 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 d937ae2..de86d0c 100644
--- a/setup.py
+++ b/setup.py
@@ -11,7 +11,7 @@ from distutils.errors import CCompilerError, DistutilsExecError, \
DistutilsPlatformError
IS_PYPY = hasattr(sys, 'pypy_translation_info')
-VERSION = '3.6.4'
+VERSION = '3.6.5'
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 cbb5b34..8c0b698 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.6.4'
+__version__ = '3.6.5'
__all__ = [
'dump', 'dumps', 'load', 'loads',
'JSONDecoder', 'JSONDecodeError', 'JSONEncoder',