export JSONEncoderForHTML (#41), bump to v2.6.2v2.6.2

5 files changed, 12 insertions, 9 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index 598e216..f9566a9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,8 @@
+Version 2.6.2 released 2012-09-21
+
+* JSONEncoderForHTML was not exported in the simplejson module
+  https://github.com/simplejson/simplejson/issues/41
+
 Version 2.6.1 released 2012-07-27
 
 * raw_decode() now skips whitespace before the object
diff --git a/conf.py b/conf.py
index 8401dbf..2309f88 100644
--- a/conf.py
+++ b/conf.py
@@ -44,7 +44,7 @@ copyright = '2012, Bob Ippolito'
 # The short X.Y version.
 version = '2.6'
 # The full version, including alpha/beta/rc tags.
-release = '2.6.1'
+release = '2.6.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 b257890..f799e29 100644
--- a/setup.py
+++ b/setup.py
@@ -7,7 +7,7 @@ from distutils.errors import CCompilerError, DistutilsExecError, \
     DistutilsPlatformError
 
 IS_PYPY = hasattr(sys, 'pypy_translation_info')
-VERSION = '2.6.1'
+VERSION = '2.6.2'
 DESCRIPTION = "Simple, fast, extensible JSON encoder/decoder for Python"
 LONG_DESCRIPTION = open('README.rst', 'r').read()
 
diff --git a/simplejson/__init__.py b/simplejson/__init__.py
index dcf072d..fe2bd5a 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.6.1'
+__version__ = '2.6.2'
 __all__ = [
     'dump', 'dumps', 'load', 'loads',
     'JSONDecoder', 'JSONDecodeError', 'JSONEncoder',
@@ -109,7 +109,7 @@ __author__ = 'Bob Ippolito <bob@redivi.com>'
 from decimal import Decimal
 
 from decoder import JSONDecoder, JSONDecodeError
-from encoder import JSONEncoder
+from encoder import JSONEncoder, JSONEncoderForHTML
 def _import_OrderedDict():
     import collections
     try:
diff --git a/simplejson/tests/test_encode_for_html.py b/simplejson/tests/test_encode_for_html.py
index c2d5f80..f995254 100644
--- a/simplejson/tests/test_encode_for_html.py
+++ b/simplejson/tests/test_encode_for_html.py
@@ -1,14 +1,12 @@
 import unittest
 
-import simplejson.decoder
-import simplejson.encoder
-
+import simplejson as json
 
 class TestEncodeForHTML(unittest.TestCase):
 
     def setUp(self):
-        self.decoder = simplejson.decoder.JSONDecoder()
-        self.encoder = simplejson.encoder.JSONEncoderForHTML()
+        self.decoder = json.JSONDecoder()
+        self.encoder = json.JSONEncoderForHTML()
 
     def test_basic_encode(self):
         self.assertEqual(r'"\u0026"', self.encoder.encode('&'))