bump to 2.3.3 and clean up indent code

CHANGES.txt

+Version 2.3.3 released 2012-02-27
+
+* Allow unknown numerical types for indent parameter
+  https://github.com/simplejson/simplejson/pull/29
+
 Version 2.3.2 released 2011-12-30
 
 * Fix crashing regression in speedups introduced in 2.3.1

conf.py

@@ -44,7 +44,7 @@
 # The short X.Y version.
 version = '2.3'
 # The full version, including alpha/beta/rc tags.
-release = '2.3.2'
+release = '2.3.3'
 
 # There are two options for replacing |today|: either, you set today to some
 # non-false value, then it is used:

setup.py

@@ -7,7 +7,7 @@
     DistutilsPlatformError
 
 IS_PYPY = hasattr(sys, 'pypy_translation_info')
-VERSION = '2.3.2'
+VERSION = '2.3.3'
 DESCRIPTION = "Simple, fast, extensible JSON encoder/decoder for Python"
 LONG_DESCRIPTION = open('README.rst', 'r').read()
 

simplejson/__init__.py

@@ -97,7 +97,7 @@
     $ echo '{ 1.2:3.4}' | python -m simplejson.tool
     Expecting property name: line 1 column 2 (char 2)
 """
-__version__ = '2.3.2'
+__version__ = '2.3.3'
 __all__ = [
     'dump', 'dumps', 'load', 'loads',
     'JSONDecoder', 'JSONDecodeError', 'JSONEncoder',

simplejson/encoder.py

@@ -170,5 +170,5 @@
         self.use_decimal = use_decimal
         self.namedtuple_as_object = namedtuple_as_object
         self.tuple_as_array = tuple_as_array
-        try:
+        if indent is not None and not isinstance(indent, basestring):
             indent = indent * ' '
@@ -174,6 +174,4 @@
             indent = indent * ' '
-        except TypeError:
-            pass
         self.indent = indent
         if separators is not None:
             self.item_separator, self.key_separator = separators