| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Update appveyor.ymlfelixonmars-patch-1-1 | Felix Yan | 2018-09-05 | 1 | -1/+1 |
| | | |||||
| * | Merge pull request #233 from simplejson/travis-py37 | Bob Ippolito | 2018-09-04 | 2 | -2/+12 |
| |\ | | | | | Add Python 3.7 to Travis | ||||
| | * | pyenv on osx is not up to date yet | Bob Ippolito | 2018-09-04 | 1 | -5/+2 |
| | | | |||||
| | * | Merge branch 'master' into travis-py37 | Bob Ippolito | 2018-09-04 | 1 | -5/+13 |
| | |\ | |/ |/| | |||||
| * | | Merge pull request #234 from simplejson/appveyor-py37 | Bob Ippolito | 2018-09-04 | 1 | -5/+13 |
| |\ \ | | | | | | | Add Python 3.7 to appveyor | ||||
| | * | | Add Python 3.7 to appveyor | Bob Ippolito | 2018-09-04 | 1 | -5/+13 |
| |/ / | |||||
| | * | Change pyenv clone URL | Bob Ippolito | 2018-09-04 | 1 | -1/+1 |
| | | | |||||
| | * | Use xenial distro for Python 3.7 | Bob Ippolito | 2018-09-04 | 1 | -1/+1 |
| | | | | | | | per https://github.com/travis-ci/travis-ci/issues/9815 | ||||
| | * | Add Python 3.7 to Travis | Bob Ippolito | 2018-09-04 | 1 | -1/+14 |
| |/ | |||||
| * | Merge pull request #231 from ushuz/manylinux1-wheels | Bob Ippolito | 2018-09-03 | 3 | -2/+12 |
| |\ | | | | | Build manylinux1 wheels with cibuildwheel 0.9.4 | ||||
| | * | Build manylinux1 wheels with cibuildwheel 0.9.4 | John Hu | 2018-09-03 | 3 | -2/+12 |
| |/ | |||||
| * | Update CHANGES for v3.16.0v3.16.0 | Bob Ippolito | 2018-06-28 | 4 | -4/+14 |
| | | |||||
| * | Merge pull request #225 from benjaminp/empty-str | Bob Ippolito | 2018-06-27 | 2 | -7/+10 |
| |\ | | | | | On Python 2, decode empty strings as str not unicode. | ||||
| | * | fix indentation | Benjamin Peterson | 2018-06-26 | 1 | -1/+1 |
| | | | |||||
| | * | add test | Benjamin Peterson | 2018-06-26 | 1 | -0/+2 |
| | | | |||||
| | * | On Python 2, decode empty strings as str not unicode. | Benjamin Peterson | 2018-06-26 | 1 | -7/+8 |
| |/ | | | | | | | | | | | | | | | | In general on Python 2, simplejson decodes ASCII strings as str, only promoting to unicode when needed: >>> simplejson.loads('["Spaetzle", "Spätzle"]') ['Spaetzle', u'Sp\xe4tzle'] Since 83a493db6a8b859ec7b10fa85365dd3fdf144c68, though, simplejson has always decoded empty JSON strings as unicode: >>> simplejson.loads('""') u'' This PR restores the old behavior of decoding empty strings as str. | ||||
| * | Merge pull request #224 from hugovk/python_requires | Bob Ippolito | 2018-06-19 | 1 | -2/+5 |
| |\ | | | | | Add python_requires to help pip | ||||
| | * | Add python_requires to help pip | Hugo | 2018-06-19 | 1 | -0/+3 |
| | | | |||||
| | * | http -> https | Hugo | 2018-06-19 | 1 | -2/+2 |
| |/ | |||||
| * | Merge pull request #222 from simplejson/doc-css-fix-gh-221 | Bob Ippolito | 2018-06-04 | 1 | -1/+1 |
| |\ | | | | | Allow Sphinx to set css file name | ||||
| | * | Fix #221. Allow Sphinx to set css file namedoc-css-fix-gh-221 | Bob Ippolito | 2018-06-04 | 1 | -1/+1 |
| |/ | |||||
| * | v3.15.0v3.15.0 | Bob Ippolito | 2018-05-12 | 4 | -4/+19 |
| | | |||||
| * | Merge pull request #220 from simplejson/speedups-cleanup | Bob Ippolito | 2018-05-12 | 1 | -141/+105 |
| |\ | | | | | Clean up the C code. | ||||
| | * | Merge branch 'master' into speedups-cleanupspeedups-cleanup | Bob Ippolito | 2018-04-25 | 4 | -15/+76 |
| | |\ | |/ |/| | |||||
| * | | Merge pull request #219 from simplejson/str-decode | Bob Ippolito | 2018-04-25 | 4 | -15/+76 |
| |\ \ | | | | | | | Bypass the decode() method in bytes subclasses. | ||||
| | * \ | Merge branch 'master' into str-decodestr-decode | Bob Ippolito | 2018-04-25 | 2 | -6/+13 |
| | |\ \ | |/ / |/| | | |||||
| | * | | Fix the other comment typos | Bob Ippolito | 2018-04-25 | 1 | -3/+3 |
| | | | | |||||
| | * | | fix comment typos | Bob Ippolito | 2018-04-25 | 1 | -3/+3 |
| | | | | |||||
| | * | | Bypass the decode() method in bytes subclasses. | Serhiy Storchaka | 2018-04-25 | 4 | -15/+76 |
| | | | | | | | | | | | | | | | | The Python and the C implementations produce different results due to using the decode() method. | ||||
| | | * | Merge branch 'master' into speedups-cleanup | Bob Ippolito | 2018-04-25 | 2 | -6/+13 |
| | | |\ | |_|/ |/| | | |||||
| * | | | Merge pull request #217 from simplejson/cStringIO | Bob Ippolito | 2018-04-25 | 2 | -6/+13 |
| |\ \ \ | |/ / |/| | | Support builds without cStringIO. | ||||
| | * | | Support builds without cStringIO.cStringIO | Serhiy Storchaka | 2018-04-25 | 2 | -6/+13 |
| |/ / | | | | | | | | | The cStringIO module is optional. Fall back to StringIO if it is not available. | ||||
| | * | Clean up the C code. | Serhiy Storchaka | 2018-04-25 | 1 | -141/+105 |
| |/ | | | | | | | | | * Define less version-specific macros. * Remove redundant version checks and code inside version-specific code. * Always check `PyUnicode_READY()` for external unicode objects. * Use `PyUnicode_Join()`. * Use `PyUnicode_FromOrdinal()`. * All Python string constants are now allocated only once. | ||||
| * | Merge pull request #216 from simplejson/bytes-encoding | Bob Ippolito | 2018-04-24 | 4 | -21/+125 |
| |\ | | | | | Allow to disable serializing bytes by default in Python 3. | ||||
| | * | Allow to disable serializing bytes by default in Python 3.bytes-encoding | Serhiy Storchaka | 2018-04-25 | 4 | -21/+125 |
| |/ | | | | | If encoding is None, then bytes objects will be passed to the default() method instead of transforming into unicode. | ||||
| * | Merge pull request #215 from simplejson/compat | Bob Ippolito | 2018-04-24 | 7 | -36/+29 |
| |\ | | | | | Simplify the compatibility code. | ||||
| | * | Simplify compatibility code.compat | Serhiy Storchaka | 2018-04-24 | 7 | -36/+29 |
| | | | | | | | | | | | Since minimal supported Python 3 version is 3.3, the u() helper no longer needed. | ||||
| * | | Merge pull request #214 from simplejson/tempfile-py25 | Bob Ippolito | 2018-04-24 | 1 | -9/+18 |
| |\ \ | |/ |/| | Fix tests in Python 2.5. | ||||
| | * | Fix tests in Python 2.5.tempfile-py25 | Serhiy Storchaka | 2018-04-24 | 1 | -9/+18 |
| |/ | | | | NamedTemporaryFile supports the "delete" argument only since 2.6. | ||||
| * | v3.14.0v3.14.0 | Bob Ippolito | 2018-04-21 | 4 | -6/+10 |
| | | |||||
| * | Merge pull request #212 from richvdh/rav/defer_is_rawjson_test | Bob Ippolito | 2018-04-09 | 1 | -6/+6 |
| |\ | | | | | Defer is_raw_json test | ||||
| | * | Defer is_raw_json test | Richard van der Hoff | 2018-04-03 | 1 | -6/+6 |
| | | | | | | | | | | | | | Instances of RawJSON are unusual; by moving the test for them to lower in encoder_listencode_obj, we get a 12% performance improvement in my tests by not doing the instanceof test. | ||||
| * | | Merge pull request #211 from richvdh/rav/fix_linebreak_encoding | Bob Ippolito | 2018-04-02 | 4 | -8/+27 |
| |\ \ | |/ |/| | Avoid escaping U+2028 and U+2029 without ensure_ascii | ||||
| | * | Remove redundant parts of ESCAPE and ESCAPE_DCT | Richard van der Hoff | 2018-03-29 | 1 | -3/+1 |
| | | | | | | | | | | | | | | | * `\b\f\n\r\t` are all in the range `\x00-\x1f` so can be omitted from ESCAPE * `ESCAPE_DCT[0x2028:0x2029]` is no longer used in `encode_basestring`, and `py_encode_basestring_ascii` handles them via the generic `\uNNNN` code, so these entries can be removed from `ESCAPE_DCT`. | ||||
| | * | documentation updates | Richard van der Hoff | 2018-03-29 | 2 | -4/+4 |
| | | | |||||
| | * | Update documentation for JSONEncoderForHTML | Richard van der Hoff | 2018-03-29 | 1 | -0/+5 |
| | | | |||||
| | * | Improve docstring on JSONEncoderForHTML | Richard van der Hoff | 2018-03-29 | 1 | -0/+5 |
| | | | | | | | | | Document the U+2028 and U+2029 behavior. | ||||
| | * | Simplify ESCAPE regexp construction | Richard van der Hoff | 2018-03-29 | 1 | -4/+1 |
| | | | | | | | | | | | Now that we do not include \uNNNN escapes in the regex, we can use a raw string rather than having to double-escape everything. | ||||
| | * | Avoid escaping U+2028 and U+2029 without ensure_ascii | Richard van der Hoff | 2018-03-29 | 3 | -4/+18 |
| |/ | | | | | There is no need to escape U+2028 and U+2029 when ensure_ascii is false, and doing so makes us inconsistent with the standard JSON library. | ||||
| * | Update CHANGES.txt and increment version to 3.13.3 | Bob Ippolito | 2018-03-27 | 4 | -3/+8 |
| | | |||||
 |
index : delta/simplejson.git | |
| github.com: simplejson/simplejson.git |
| summaryrefslogtreecommitdiff |