Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #302 from simplejson/class-serializationv3.18.0 | Bob Ippolito | 2022-11-14 | 8 | -87/+131 |
|\ | | | | | Class serialization | ||||
| * | Revert unnecessary change | Bob Ippolito | 2022-11-14 | 1 | -1/+2 |
| | | |||||
| * | Rename variable for clarity | Bob Ippolito | 2022-11-14 | 1 | -5/+5 |
| | | |||||
| * | v3.18.0 | Bob Ippolito | 2022-11-14 | 3 | -4/+4 |
| | | |||||
| * | Implement speedups for #301 | Bob Ippolito | 2022-11-14 | 1 | -62/+68 |
| | | |||||
| * | Implement tests and fallback implementation of #301 | Bob Ippolito | 2022-11-14 | 4 | -22/+59 |
|/ | |||||
* | Merge pull request #300 from Attakay78/master | Bob Ippolito | 2022-07-01 | 1 | -1/+1 |
|\ | | | | | #299 Comment error fix | ||||
| * | #299 Comment error fix | Richard Quaicoe | 2022-07-01 | 1 | -1/+1 |
|/ | |||||
* | Update CHANGES.txt and bump version | Bob Ippolito | 2022-04-22 | 5 | -5/+12 |
| | |||||
* | Merge pull request #298 from ks888/fix-value-error | Bob Ippolito | 2022-04-21 | 2 | -0/+4 |
|\ | | | | | Check the unicode code point range before unichr() is called | ||||
| * | Add the unit test | Kishin Yagami | 2022-04-21 | 1 | -0/+2 |
| | | |||||
| * | Check the unicode code point range before chr() is called | Kishin Yagami | 2022-04-21 | 1 | -0/+2 |
|/ | |||||
* | Merge pull request #293 from simplejson/v3.17.6v3.17.6 | Bob Ippolito | 2021-11-15 | 3 | -3/+3 |
|\ | | | | | v3.17.6 | ||||
| * | v3.17.6v3.17.6 | Bob Ippolito | 2021-11-15 | 3 | -3/+3 |
|/ | |||||
* | Merge pull request #292 from simplejson/python-3.10 | Bob Ippolito | 2021-11-15 | 2 | -2/+8 |
|\ | | | | | Build source with Python 3.10, update CHANGES | ||||
| * | Build source with Python 3.10, update CHANGES | Bob Ippolito | 2021-11-15 | 2 | -2/+8 |
|/ | |||||
* | Merge pull request #291 from hugovk/add-3.10 | Bob Ippolito | 2021-11-15 | 1 | -0/+1 |
|\ | |||||
| * | Declare support for Python 3.10 | Hugo van Kemenade | 2021-11-15 | 1 | -0/+1 |
|/ | |||||
* | Update CHANGES.txtv3.17.5 | Bob Ippolito | 2021-08-23 | 1 | -1/+1 |
| | | | Release date | ||||
* | Merge pull request #289 from simplejson/fix_is_namedtuple_dict_fu | Bob Ippolito | 2021-08-23 | 4 | -7/+15 |
|\ | | | | | v3.17.5 | ||||
| * | Update version to 3.17.5 | Bob Ippolito | 2021-08-23 | 3 | -3/+3 |
| | | |||||
| * | Implement _asdict() check for pure python path as well | Bob Ippolito | 2021-08-23 | 1 | -4/+12 |
|/ | |||||
* | Merge pull request #284 from gpshead/fix_is_namedtuple_dict_fu | Bob Ippolito | 2021-08-23 | 3 | -0/+46 |
|\ | | | | | Fix the C extension module to harden is_namedtuple. | ||||
| * | Raise TypeError when _asdict() is callable but does not return a dict | Bob Ippolito | 2021-08-23 | 1 | -0/+5 |
| | | |||||
| * | oops, a missing word made it into the commit. | Gregory P. Smith | 2021-08-23 | 1 | -1/+1 |
| | | |||||
| * | Move the PyDict_Check after the _asdict call. | Gregory P. Smith [Google LLC] | 2021-08-20 | 2 | -6/+33 |
| | | | | | | | | Add a unittest. | ||||
| * | Merge branch 'master' into fix_is_namedtuple_dict_fu | Bob Ippolito | 2021-08-20 | 5 | -4/+12 |
| |\ | |/ |/| | |||||
* | | Merge pull request #287 from simplejson/upgrade-cibuildwheelv3.17.4 | Bob Ippolito | 2021-08-19 | 5 | -4/+9 |
|\ \ | | | | | | | Upgrade cibuildwheel to v2.1.1 | ||||
| * | | Upgrade cibuildwheel to v2.1.1test-v3.17.4 | Bob Ippolito | 2021-08-19 | 5 | -4/+9 |
|/ / | |||||
| * | Fix the C extension module to harden is_namedtuple. | Gregory P. Smith [Google LLC] | 2021-07-16 | 2 | -0/+11 |
|/ | | | | | | | Protects against looks-a-likes such as Mocks. Also prevent dict encoding from causing an unraised SystemError when encountering a non-Dict. Noticed by running user tests against a CPython interpreter with C asserts enabled (COPTS += -UNDEBUG). | ||||
* | Merge pull request #283 from simplejson/github-actionsv3.17.3 | Bob Ippolito | 2021-07-09 | 17 | -493/+176 |
|\ | | | | | Replace travis and appveyor with github actions | ||||
| * | Replace travis and appveyor with github actions | Bob Ippolito | 2021-07-09 | 17 | -493/+176 |
|/ | |||||
* | Merge pull request #273 from timgates42/bugfix_typo_precedence | Bob Ippolito | 2020-12-29 | 1 | -1/+1 |
|\ | | | | | docs: fix simple typo, precendence -> precedence | ||||
| * | docs: fix simple typo, precendence -> precedence | Tim Gates | 2020-12-29 | 1 | -1/+1 |
|/ | | | | | | There is a small typo in simplejson/__init__.py. Should read `precedence` rather than `precendence`. | ||||
* | Merge pull request #271 from cclauss/patch-1 | Bob Ippolito | 2020-12-18 | 1 | -0/+3 |
|\ | | | | | Travis CI: Add Python 3.9 to the testing | ||||
| * | Travis CI: Add Python 3.9 to the testing | Christian Clauss | 2020-12-18 | 1 | -0/+3 |
|/ | |||||
* | v3.17.2v3.17.2 | Bob Ippolito | 2020-07-16 | 4 | -5/+6 |
| | |||||
* | Add manylinux wheels back for amd64 | Bob Ippolito | 2020-07-16 | 1 | -1/+3 |
| | |||||
* | v3.17.1v3.17.1 | Bob Ippolito | 2020-07-16 | 4 | -4/+13 |
| | |||||
* | Merge pull request #264 from odidev/arm_support | Bob Ippolito | 2020-07-16 | 2 | -1/+12 |
|\ | | | | | Added arm64 support in travis-ci | ||||
| * | Added arm64 support in travis-ci | odidev | 2020-07-15 | 2 | -1/+12 |
|/ | | | | Signed-off-by: odidev <odidev@puresoftware.com> | ||||
* | Resolves #261, improve README grammar | Bob Ippolito | 2020-04-17 | 1 | -1/+1 |
| | |||||
* | Merge pull request #260 from simplejson/pep-0527 | Bob Ippolito | 2020-03-14 | 3 | -9/+14 |
|\ | | | | | Per PEP 527 stop building bdist_wininst | ||||
| * | Update travis matrixpep-0527 | Bob Ippolito | 2020-03-14 | 1 | -7/+12 |
| | | |||||
| * | Per PEP 527 stop building bdist_wininst | Bob Ippolito | 2020-03-14 | 2 | -2/+2 |
|/ | |||||
* | Set version back to v3.17.0v3.17.0 | Bob Ippolito | 2019-11-17 | 4 | -5/+5 |
| | |||||
* | Bump version to v3.18.0 to work around build issues | Bob Ippolito | 2019-11-17 | 3 | -4/+4 |
| | |||||
* | Rotate API key again | Bob Ippolito | 2019-11-17 | 1 | -2/+2 |
| | |||||
* | Remove old API key | Bob Ippolito | 2019-11-17 | 1 | -2/+0 |
| | |||||
* | Update travis deploy key | Bob Ippolito | 2019-11-17 | 1 | -3/+5 |
| |