summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Ippolito <bob@redivi.com>2007-03-04 05:25:15 +0000
committerBob Ippolito <bob@redivi.com>2007-03-04 05:25:15 +0000
commitaf4ac5de0e35b8dad38bc9055529463cddff0fde (patch)
tree0741ffb78289ba3961bb32fde0a51b3a51c1932c
parentc8ef072961c6df696b030505c1cabf23f093cada (diff)
downloadsimplejson-af4ac5de0e35b8dad38bc9055529463cddff0fde.tar.gz
update version to 1.6
git-svn-id: http://simplejson.googlecode.com/svn/trunk@41 a4795897-2c25-0410-b006-0d3caba88fa1
-rw-r--r--docs/simplejson/__init__.py.html2
-rw-r--r--setup.py2
-rw-r--r--simplejson/__init__.py2
3 files changed, 3 insertions, 3 deletions
diff --git a/docs/simplejson/__init__.py.html b/docs/simplejson/__init__.py.html
index 81602d9..5164f90 100644
--- a/docs/simplejson/__init__.py.html
+++ b/docs/simplejson/__init__.py.html
@@ -158,7 +158,7 @@ function show_line_range() {
<a class="lnum" href="#86" name="86">0086</a><span class="string">Note&#0160;that&#0160;the&#0160;JSON&#0160;produced&#0160;by&#0160;this&#0160;module's&#0160;default&#0160;settings</span><br />
<a class="lnum" href="#87" name="87">0087</a><span class="string">is&#0160;a&#0160;subset&#0160;of&#0160;YAML,&#0160;so&#0160;it&#0160;may&#0160;be&#0160;used&#0160;as&#0160;a&#0160;serializer&#0160;for&#0160;that&#0160;as&#0160;well.</span><br />
<a class="lnum" href="#88" name="88">0088</a><span class="string">"""</span><br />
-<a class="lnum" href="#89" name="89">0089</a><span class="name">__version__</span>&#0160;<span class="op">=</span>&#0160;<span class="string">'1.5'</span><br />
+<a class="lnum" href="#89" name="89">0089</a><span class="name">__version__</span>&#0160;<span class="op">=</span>&#0160;<span class="string">'1.6'</span><br />
<a class="lnum" href="#90" name="90">0090</a><span class="name">__all__</span>&#0160;<span class="op">=</span>&#0160;<span class="op">[</span><br />
<a class="lnum" href="#91" name="91">0091</a>&#0160;&#0160;&#0160;&#0160;<span class="string">'dump'</span><span class="op">,</span>&#0160;<span class="string">'dumps'</span><span class="op">,</span>&#0160;<span class="string">'load'</span><span class="op">,</span>&#0160;<span class="string">'loads'</span><span class="op">,</span><br />
<a class="lnum" href="#92" name="92">0092</a>&#0160;&#0160;&#0160;&#0160;<span class="string">'JSONDecoder'</span><span class="op">,</span>&#0160;<span class="string">'JSONEncoder'</span><span class="op">,</span><br />
diff --git a/setup.py b/setup.py
index a5c7eab..7cf6d49 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ ez_setup.use_setuptools()
from setuptools import setup, find_packages
-VERSION = '1.5'
+VERSION = '1.6'
DESCRIPTION = "Simple, fast, extensible JSON encoder/decoder for Python"
LONG_DESCRIPTION = """
simplejson is a simple, fast, complete, correct and extensible
diff --git a/simplejson/__init__.py b/simplejson/__init__.py
index bbec083..dc3d99d 100644
--- a/simplejson/__init__.py
+++ b/simplejson/__init__.py
@@ -86,7 +86,7 @@ Extending JSONEncoder::
Note that the JSON produced by this module's default settings
is a subset of YAML, so it may be used as a serializer for that as well.
"""
-__version__ = '1.5'
+__version__ = '1.6'
__all__ = [
'dump', 'dumps', 'load', 'loads',
'JSONDecoder', 'JSONEncoder',