From 77d00d27e7f3628598742be6ac0440aa31e53a35 Mon Sep 17 00:00:00 2001 From: Bob Ippolito Date: Tue, 22 Oct 2019 11:07:03 -0700 Subject: Start transitioning docs to be Python 3 centric --- CHANGES.txt | 6 ++++++ README.rst | 12 +++++++----- index.rst | 16 ++++++++++------ 3 files changed, 23 insertions(+), 11 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 40083a8..ddc671c 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,3 +1,9 @@ +Version 3.16.2 released 2019-10-22 + +* Update build matrix for Python 3.8 + https://github.com/simplejson/simplejson/pull/255 + https://github.com/simplejson/simplejson/pull/256 + Version 3.16.1 released 2018-09-07 * Added examples for JSON lines use cases diff --git a/README.rst b/README.rst index cfa8808..048a309 100644 --- a/README.rst +++ b/README.rst @@ -8,16 +8,18 @@ simplejson :target: https://ci.appveyor.com/project/etrepum/simplejson/branch/master simplejson is a simple, fast, complete, correct and extensible -JSON encoder and decoder for Python 2.5+ -and Python 3.3+. It is pure Python code with no dependencies, -but includes an optional C extension for a serious speed boost. +JSON encoder and decoder for Python 3.3+ +with legacy support for Python 2.5+. It is pure Python code +with no dependencies, but includes an optional C extension +for a serious speed boost. The latest documentation for simplejson can be read online here: https://simplejson.readthedocs.io/ 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. +json library included with Python (since 2.6). This version is tested +with the latest Python 3.8 and maintains backwards compatibility +with Python 3.3+ and the legacy Python 2.5 - Python 2.7 releases. The encoder can be specialized to provide serialization in any kind of situation, without any special support by the objects to be serialized diff --git a/index.rst b/index.rst index 85388b4..66596a4 100644 --- a/index.rst +++ b/index.rst @@ -13,12 +13,16 @@ is a lightweight data interchange format inspired by `JavaScript `_ object literal syntax (although it is not a strict subset of JavaScript [#rfc-errata]_ ). +:mod:`simplejson` is a simple, fast, complete, correct and extensible +JSON encoder and decoder for Python. It is pure Python code +with no dependencies, but includes an optional C extension +for a serious speed boost. + :mod:`simplejson` exposes an API familiar to users of the standard library :mod:`marshal` and :mod:`pickle` modules. It is the externally maintained -version of the :mod:`json` library contained in Python 2.6, but maintains -compatibility with Python 2.5 and (currently) has -significant performance advantages, even without using the optional C -extension for speedups. :mod:`simplejson` is also supported on Python 3.3+. +version of the :mod:`json` library, but maintains +compatibility with the latest Python 3.8+ releases back to Python 3.3 +as well as the legacy Python 2.5 - Python 2.7 releases. Development of simplejson happens on Github: http://github.com/simplejson/simplejson @@ -61,10 +65,10 @@ Pretty printing:: Decoding JSON:: >>> import simplejson as json - >>> obj = [u'foo', {u'bar': [u'baz', None, 1.0, 2]}] + >>> obj = ['foo', {'bar': ['baz', None, 1.0, 2]}] >>> json.loads('["foo", {"bar":["baz", null, 1.0, 2]}]') == obj True - >>> json.loads('"\\"foo\\bar"') == u'"foo\x08ar' + >>> json.loads('"\\"foo\\bar"') == '"foo\x08ar' True >>> from simplejson.compat import StringIO >>> io = StringIO('["streaming API"]') -- cgit v1.2.1