http://code.google.com/p/simplejson/issues/detail?id=73

git-svn-id: http://simplejson.googlecode.com/svn/trunk@226 a4795897-2c25-0410-b006-0d3caba88fa1

5 files changed, 20 insertions, 6 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index 29889b5..e9a1317 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,9 @@
+Version 2.1.1 released 2010-03-11
+
+* Corrected simplejson.__version__ and other minor doc changes.
+* Do not fail speedups tests if speedups could not be built.
+  http://code.google.com/p/simplejson/issues/detail?id=73
+
 Version 2.1.0 released 2010-03-10
 
 * Decimal serialization officially supported for encoding with
diff --git a/conf.py b/conf.py
index 2d1a7a2..b12e76d 100644
--- a/conf.py
+++ b/conf.py
@@ -44,7 +44,7 @@ copyright = '2008, Bob Ippolito'
 # The short X.Y version.
 version = '2.1'
 # The full version, including alpha/beta/rc tags.
-release = '2.1.0'
+release = '2.1.1'
 
 # 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 54dd9d7..e2e90cc 100644
--- a/setup.py
+++ b/setup.py
@@ -12,16 +12,17 @@ from distutils.command.build_ext import build_ext
 from distutils.errors import CCompilerError, DistutilsExecError, \
     DistutilsPlatformError
 
-VERSION = '2.1.0'
+VERSION = '2.1.1'
 DESCRIPTION = "Simple, fast, extensible JSON encoder/decoder for Python"
 LONG_DESCRIPTION = """
 simplejson is a simple, fast, complete, correct and extensible
-JSON <http://json.org> encoder and decoder for Python 2.4+.  It is
+JSON <http://json.org> encoder and decoder for Python 2.5+.  It is
 pure Python code with no dependencies, but includes an optional C
 extension for a serious speed boost.
 
-simplejson was formerly known as simple_json, but changed its name to
-comply with PEP 8 module naming guidelines.
+simplejson is the externally maintained development version of the
+json library included with Python 2.6 and Python 3.0, but maintains
+backwards compatibility with Python 2.5.
 
 The encoder may be subclassed to provide serialization in any kind of
 situation, without any special support by the objects to be serialized
diff --git a/simplejson/__init__.py b/simplejson/__init__.py
index dacaab1..dcfd541 100644
--- a/simplejson/__init__.py
+++ b/simplejson/__init__.py
@@ -97,7 +97,7 @@ Using simplejson.tool from the shell to validate and pretty-print::
     $ echo '{ 1.2:3.4}' | python -m simplejson.tool
     Expecting property name: line 1 column 2 (char 2)
 """
-__version__ = '2.1.0rc3'
+__version__ = '2.1.1'
 __all__ = [
     'dump', 'dumps', 'load', 'loads',
     'JSONDecoder', 'JSONDecodeError', 'JSONEncoder',
diff --git a/simplejson/tests/test_speedups.py b/simplejson/tests/test_speedups.py
index d0c3c9b..4bf0875 100644
--- a/simplejson/tests/test_speedups.py
+++ b/simplejson/tests/test_speedups.py
@@ -3,11 +3,18 @@ from unittest import TestCase
 
 from simplejson import decoder, encoder, scanner
 
+def has_speedups():
+    return encoder.c_make_encoder is not None
+
 class TestDecode(TestCase):
     def test_make_scanner(self):
+        if not has_speedups():
+            return
         self.assertRaises(AttributeError, scanner.c_make_scanner, 1)
 
     def test_make_encoder(self):
+        if not has_speedups():
+            return
         self.assertRaises(TypeError, encoder.c_make_encoder,
             None,
             "\xCD\x7D\x3D\x4E\x12\x4C\xF9\x79\xD7\x52\xBA\x82\xF2\x27\x4A\x7D\xA0\xCA\x75",