diff --git a/CHANGES.txt b/CHANGES.txt index d23ed7f280260c81d01b84eb3aececeeba4a4eb0_Q0hBTkdFUy50eHQ=..d0c312b39863416aeb187ab639f49feb4a9f981b_Q0hBTkdFUy50eHQ= 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 d23ed7f280260c81d01b84eb3aececeeba4a4eb0_Y29uZi5weQ==..d0c312b39863416aeb187ab639f49feb4a9f981b_Y29uZi5weQ== 100644 --- a/conf.py +++ b/conf.py @@ -44,7 +44,7 @@ # 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 d23ed7f280260c81d01b84eb3aececeeba4a4eb0_c2V0dXAucHk=..d0c312b39863416aeb187ab639f49feb4a9f981b_c2V0dXAucHk= 100644 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ 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 d23ed7f280260c81d01b84eb3aececeeba4a4eb0_c2ltcGxlanNvbi9fX2luaXRfXy5weQ==..d0c312b39863416aeb187ab639f49feb4a9f981b_c2ltcGxlanNvbi9fX2luaXRfXy5weQ== 100644 --- a/simplejson/__init__.py +++ b/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.6.1' +__version__ = '2.6.2' __all__ = [ 'dump', 'dumps', 'load', 'loads', 'JSONDecoder', 'JSONDecodeError', 'JSONEncoder', @@ -109,7 +109,7 @@ 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 d23ed7f280260c81d01b84eb3aececeeba4a4eb0_c2ltcGxlanNvbi90ZXN0cy90ZXN0X2VuY29kZV9mb3JfaHRtbC5weQ==..d0c312b39863416aeb187ab639f49feb4a9f981b_c2ltcGxlanNvbi90ZXN0cy90ZXN0X2VuY29kZV9mb3JfaHRtbC5weQ== 100644 --- a/simplejson/tests/test_encode_for_html.py +++ b/simplejson/tests/test_encode_for_html.py @@ -1,9 +1,7 @@ import unittest -import simplejson.decoder -import simplejson.encoder - +import simplejson as json class TestEncodeForHTML(unittest.TestCase): def setUp(self): @@ -6,9 +4,9 @@ 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('&'))