| 3723f57 | Joakim Hamren | 20 January 2016, 08:10:48 UTC | Reverting usage of python setup.py test | 20 January 2016, 08:10:48 UTC |
| e3ca6c5 | Joakim Hamren | 18 January 2016, 06:44:55 UTC | Fixed assertRegex error on python 2 and checking if nose2.collector works with python 2.6 | 18 January 2016, 06:44:55 UTC |
| 7079f3c | Joakim Hamren | 18 January 2016, 05:51:46 UTC | Added unittest2 to setup.py tests_require | 18 January 2016, 05:51:46 UTC |
| 52bc13b | Joakim Hamren | 18 January 2016, 05:49:26 UTC | Bumping version to 1.35 | 18 January 2016, 05:49:26 UTC |
| 23f0924 | Joakim Hamren | 18 January 2016, 05:45:34 UTC | Added test package requirements to setup.py | 18 January 2016, 05:45:34 UTC |
| 1c21733 | Joakim Hamren | 18 January 2016, 05:39:22 UTC | Merge branch 'ngandhy-master' | 18 January 2016, 05:39:22 UTC |
| 4da6667 | Joakim Hamren | 18 January 2016, 05:38:34 UTC | Merge branch 'master' of https://github.com/ngandhy/ultrajson into ngandhy-master Conflicts: tests/tests.py | 18 January 2016, 05:38:34 UTC |
| 74ee682 | Joakim Hamren | 18 January 2016, 05:26:06 UTC | Merge branch 'timdawborn-correct_unit_tests_and_benchmarks' | 18 January 2016, 05:26:06 UTC |
| 7314538 | Joakim Hamren | 18 January 2016, 05:24:11 UTC | Removed commented out code from merge | 18 January 2016, 05:24:11 UTC |
| 01cb249 | Joakim Hamren | 18 January 2016, 05:20:14 UTC | Merge branch 'correct_unit_tests_and_benchmarks' of https://github.com/timdawborn/ultrajson into timdawborn-correct_unit_tests_and_benchmarks Conflicts: tests/tests.py | 18 January 2016, 05:20:14 UTC |
| 86bb8ff | Joakim Hamrén | 15 January 2016, 04:06:19 UTC | Merge pull request #157 from wlanslovenija/raw-json If an object has a __json__ method, use it when encoding | 15 January 2016, 04:06:19 UTC |
| 07507b7 | Joakim Hamrén | 15 January 2016, 03:13:02 UTC | Merge pull request #191 from joshkel/master Update tests for floating point inaccuracies | 15 January 2016, 03:13:02 UTC |
| 8c0edfb | Joakim Hamrén | 15 January 2016, 03:05:46 UTC | Merge pull request #203 from timdawborn/sort_keys_memory_leak Corrected memory leak in sort_keys=True | 15 January 2016, 03:05:46 UTC |
| 2033cfc | Joakim Hamrén | 15 January 2016, 02:59:01 UTC | Merge pull request #136 from b4hand/fix-typo Fix typo. | 15 January 2016, 02:59:01 UTC |
| f35e664 | Joakim Hamrén | 15 January 2016, 02:51:05 UTC | Merge pull request #195 from aebrahim/patch-1 Test on python 3.5 on travis | 15 January 2016, 02:51:05 UTC |
| 06fe4c6 | Joakim Hamrén | 15 January 2016, 02:50:42 UTC | Merge pull request #186 from shashurup/master escape_forward_slashes now only ignores forward slashes, not everythi… | 15 January 2016, 02:50:42 UTC |
| 4c5c061 | Tim Dawborn | 29 December 2015, 03:24:40 UTC | Updated benchmark results, and added results for both Python 2 and Python 3. Fixes #154. | 29 December 2015, 03:26:00 UTC |
| 0442850 | Tim Dawborn | 29 December 2015, 01:47:13 UTC | * Refactored the unit testing and benchmarking code to work natively under both Python 2 and Python 3, removing the need for 2to3 to be run. This indirectly fixes #177. * Corrected a duplicate-named method in the unit testing code. Corrected the now-exposed broken logic that wasn't being tested. This was highlighted in #186 but the author did not appear to realise that the method name was being masked in the unit test class. * Corrected the test case skipping logic to use unittest.skipIf instead of just returning from the method upon an ImportError so that the skip can actually be registered as a skipped test instead of a passed test. * Updated the tests to additionally run on Python 3.5 on Travis. This covers #195. * Merged the two benchmarking files into one, and modularised the code. Also added native RST output so the benchmarking results can be placed directly into the README file. | 29 December 2015, 03:23:23 UTC |
| 4c4624a | Tim Dawborn | 28 December 2015, 04:46:27 UTC | Corrected memory leak due to not decrementing the reference count of the list item being replaced. | 28 December 2015, 04:46:27 UTC |
| 97887fe | Ali Ebrahim | 01 December 2015, 19:30:03 UTC | Test on python 3.5 on travis | 01 December 2015, 19:30:03 UTC |
| 0c52200 | Joakim Hamren | 30 November 2015, 10:58:32 UTC | Removed a left-over from conflict resolution. | 30 November 2015, 10:58:32 UTC |
| 6d0d191 | Josh Kelley | 15 October 2015, 01:30:07 UTC | Update tests for floating point inaccuracies Due to floating point differences in i386 versus x86-64, tests were failing on i386. Fixes GitHub issue #178. As indicated in comments there, the long-term plan is to use strtod everywhere, but this fixes the test suite for purposes such as Ubuntu packaging that need to build and test the current version. | 15 October 2015, 01:30:07 UTC |
| e94a07a | georgy | 29 September 2015, 07:28:24 UTC | Fixed test for escape_forward_slashes=False | 29 September 2015, 07:28:24 UTC |
| 457cda7 | Georgy Kibardin | 08 September 2015, 12:54:13 UTC | escape_forward_slashes now only ignores forward slashes, not everything else | 08 September 2015, 12:54:13 UTC |
| ea0ab37 | Joakim Hamren | 09 April 2015, 12:13:50 UTC | Added indent encoder option to readme | 09 April 2015, 12:13:50 UTC |
| e2bf0d0 | Joakim Hamren | 09 April 2015, 10:33:31 UTC | Added missing check for sorted key benchmark | 09 April 2015, 10:33:31 UTC |
| 72b460e | Joakim Hamren | 09 April 2015, 10:31:48 UTC | Merge branch 'indent' | 09 April 2015, 10:31:48 UTC |
| 930dfa5 | Chris Huang | 27 February 2015, 05:20:11 UTC | Support for space indent for JSON encoding | 09 April 2015, 10:30:46 UTC |
| e13549e | Joakim Hamren | 09 April 2015, 09:29:10 UTC | Added test for sort keys | 09 April 2015, 09:29:10 UTC |
| 227341a | Joakim Hamren | 08 April 2015, 18:58:50 UTC | Added option to skip other libs in benchmark | 08 April 2015, 18:58:50 UTC |
| dcddcc4 | Tim Dawborn | 17 February 2015, 23:14:31 UTC | Corrected function dispatching for sort_keys. Added benchmarking section for sort_keys. | 08 April 2015, 18:42:57 UTC |
| 921716a | Tim Dawborn | 17 February 2015, 22:41:17 UTC | Initial support for sort_keys parameter for JSON encoding. | 08 April 2015, 18:42:56 UTC |
| d143d9d | Joakim Hamrén | 08 April 2015, 11:51:30 UTC | Merge pull request #166 from leplatrem/option_disable_escape_slashes Add option to disable forward slash escape | 08 April 2015, 11:51:30 UTC |
| da46c03 | Joakim Hamrén | 06 April 2015, 14:14:58 UTC | Merge pull request #159 from methane/faster-ascii-encode Faster ascii encode | 06 April 2015, 14:14:58 UTC |
| d169b7c | Mathieu Leplatre | 31 March 2015, 21:32:14 UTC | Add option to disable forward slash escape Ref issue #144 | 31 March 2015, 21:41:51 UTC |
| a8f0f0f | Mitar | 19 December 2014, 18:29:13 UTC | If an object has a __json__ method, use it when encoding. It should return a raw JSON string which will be directly included in the resulting JSON when encoding. | 29 December 2014, 09:13:46 UTC |
| ab8f419 | INADA Naoki | 25 December 2014, 17:18:47 UTC | Don't use deprecated PyUnicode_EncodeUTF8() | 26 December 2014, 02:31:33 UTC |
| 2015faa | Joakim Hamrén | 25 December 2014, 18:20:14 UTC | Merge pull request #158 from methane/patch-1 Use new Docker based Travis-CI | 25 December 2014, 18:20:14 UTC |
| af1b05d | INADA Naoki | 25 December 2014, 16:54:45 UTC | Zero cost utf-8 encode for PyASCIIObject. Before: $ python3.4 -m timeit -n 10000 -s 'import ujson; x = ["a"*10]*100' 'ujson.dumps(x)' 10000 loops, best of 3: 15.8 usec per loop After: $ python -m timeit -n 10000 -s 'import ujson; x = ["a"*10]*100' 'ujson.dumps(x)' 10000 loops, best of 3: 7.14 usec per loop Other unicode objects creates utf-8 cache in PyUnicode_AsUTF8AndSize(). It consume extra memory. | 25 December 2014, 16:54:45 UTC |
| df1b562 | INADA Naoki | 25 December 2014, 07:30:58 UTC | Use new Docker based Travis-CI | 25 December 2014, 07:30:58 UTC |
| c974483 | Joakim Hamrén | 13 November 2014, 23:33:20 UTC | Merge pull request #142 from kevinbirch/support_unsigned_long_numerics Support values between [0, 2^64 - 1] | 13 November 2014, 23:33:20 UTC |
| cbd6878 | kevin birch | 11 November 2014, 23:25:27 UTC | add encoding support for unsigned long long | 11 November 2014, 23:25:27 UTC |
| 692f59d | kevin birch | 11 November 2014, 23:24:26 UTC | add tests for decoding unsigned long long | 11 November 2014, 23:24:26 UTC |
| f36d72c | Nik | 07 November 2014, 22:50:49 UTC | add test case as requested from jskorpan | 07 November 2014, 22:50:49 UTC |
| f6573d1 | Joakim Hamren | 31 October 2014, 14:05:12 UTC | Triggering a Travis CI build. | 31 October 2014, 14:05:12 UTC |
| 8dd258b | Joakim Hamren | 30 October 2014, 22:41:25 UTC | Setting up Travis CI | 30 October 2014, 22:41:25 UTC |
| 0a2933f | Jonas Tärnström | 29 October 2014, 10:18:27 UTC | Merge pull request #148 from Jahaja/fix Fix to avoid a crash on bounds-check fail | 29 October 2014, 10:18:27 UTC |
| a375020 | Jonas Tärnström | 29 October 2014, 10:15:39 UTC | Merge pull request #149 from Jahaja/fix2 Fixed segfault on invalid unicode char on python 3 | 29 October 2014, 10:15:39 UTC |
| 7d28dc0 | Joakim Hamren | 28 October 2014, 22:09:15 UTC | Fixed segfault on invalid unicode char on python 3 | 28 October 2014, 22:32:14 UTC |
| 4a2bfe9 | Joakim Hamren | 28 October 2014, 22:06:02 UTC | Made the tests work with Python 3 | 28 October 2014, 22:31:38 UTC |
| 1af8acd | Joakim Hamren | 28 October 2014, 17:53:09 UTC | Fix to avoid a crash on bounds-check fail | 28 October 2014, 22:30:00 UTC |
| 6430079 | kevin birch | 02 September 2014, 21:00:16 UTC | support promotion of numeric values to unsigned long | 02 September 2014, 21:00:16 UTC |
| 6b0209c | Brandon Forehand | 02 July 2014, 21:11:01 UTC | Fix typo. | 02 July 2014, 21:11:01 UTC |
| 0d76bd0 | Jonas Tarnstrom | 16 April 2014, 06:42:48 UTC | Revert "Minor performance optimization" This reverts commit 510a8fc6d7fd2af9fd39970ff3de4d9aac382706. | 16 April 2014, 06:42:48 UTC |
| 3ab2a91 | nik | 16 April 2014, 04:40:18 UTC | Merge remote-tracking branch 'upstream/master' | 16 April 2014, 04:40:18 UTC |
| 510a8fc | Jonas Tarnstrom | 14 April 2014, 13:52:22 UTC | Minor performance optimization | 14 April 2014, 13:52:22 UTC |
| 4057771 | Jonas Tarnstrom | 14 April 2014, 12:43:15 UTC | Added private argument support for encoder path | 14 April 2014, 12:43:15 UTC |
| 9f3449b | Jonas Tarnstrom | 14 April 2014, 11:45:50 UTC | Updated copyright clause | 14 April 2014, 11:45:50 UTC |
| 06173a7 | Jonas Tarnstrom | 14 April 2014, 11:38:39 UTC | Improved generic iterator support, revmoed iterBegin from encoder API, added test for blist | 14 April 2014, 11:39:03 UTC |
| 02d01f1 | Jonas Tarnstrom | 11 April 2014, 09:52:28 UTC | Removed debug printout | 14 April 2014, 11:39:02 UTC |
| a62032d | Jonas Tarnstrom | 11 April 2014, 09:50:03 UTC | Bumped version | 14 April 2014, 11:39:01 UTC |
| 23c154f | Jonas Tarnstrom | 11 April 2014, 09:49:37 UTC | Replaced UINT_MAX with SIZE_MAX as a better bound check for wrapping memory allocation sizes when escaping strings | 14 April 2014, 11:39:01 UTC |
| bf30600 | Jonas Tarnstrom | 11 April 2014, 09:47:39 UTC | Fixed broken test on Win32 | 14 April 2014, 11:39:00 UTC |
| 90a2c91 | Jonas Tärnström | 11 April 2014, 07:47:10 UTC | Merge pull request #116 from iskra/patch-1 Fix ImportError | 11 April 2014, 07:47:10 UTC |
| 73945db | Jonas Tärnström | 11 April 2014, 07:26:29 UTC | Merge pull request #131 from mvismonte/fix-seg-fault [ujson] Fixing seg faults in unit tests | 11 April 2014, 07:26:29 UTC |
| 2dca006 | Mark Vismonte | 01 February 2014, 04:36:47 UTC | [ujson] Fixing seg faults in unit tests - The following unit tests were causing segfaults: ``` test_doubleLongDecimalIssue test_invalidDoublePrecision test_doublePrecisionTest test_encodeDecimal test_doubleLongIssue test_encodeDecodeLongDecimal ``` - I changed a constant that couldn't be `const` because it can be overwritten by a passed in parameter | 02 February 2014, 00:58:57 UTC |
| 6cdb1ec | Nik | 05 November 2013, 04:59:32 UTC | c-api python keeps none as an object and doesn't convert to NULL as I assumed | 05 November 2013, 04:59:32 UTC |
| 0654f7b | Nik | 05 November 2013, 04:41:51 UTC | respect utcoffset | 05 November 2013, 04:41:51 UTC |
| bb11001 | Iskra | 19 October 2013, 17:56:50 UTC | Fix ImportError | 19 October 2013, 17:56:50 UTC |
| e339f5b | Jonas Tärnström | 04 October 2013, 14:46:27 UTC | Merge pull request #107 from romuloceccon/silence_unused_PyIntToINTXX_warning Silence warning about unused PyIntToINTXX | 04 October 2013, 14:46:27 UTC |
| 1b251e4 | Jonas Tärnström | 27 September 2013, 07:08:12 UTC | Merge pull request #106 from romuloceccon/constantize_invariable_value Make idoublePrecision a true constant | 27 September 2013, 07:08:12 UTC |
| 386da82 | Jonas Tärnström | 27 September 2013, 07:07:33 UTC | Merge pull request #108 from romuloceccon/remove_unused_ClearError Remove unused function ClearError() | 27 September 2013, 07:07:33 UTC |
| c2ca24f | Romulo A. Ceccon | 26 September 2013, 20:20:59 UTC | Remove unused function ClearError() | 26 September 2013, 20:20:59 UTC |
| 343d367 | Romulo A. Ceccon | 26 September 2013, 20:15:59 UTC | Silence warning about unused PyIntToINTXX Make the declaration of PyIntToINT32/PyIntToINT64 conditional; otherwise the compiler always warns about one of them being unused. | 26 September 2013, 20:15:59 UTC |
| 28b3bb3 | Romulo A. Ceccon | 26 September 2013, 20:06:08 UTC | Make idoublePrecision a true constant Some older compilers might complain about idoublePrecision not being a constant when referenced inside the array declaration. | 26 September 2013, 20:06:08 UTC |
| 5d157b4 | Jonas Tärnström | 02 September 2013, 07:17:22 UTC | Merge pull request #103 from easonlin/master Fix minGW sprintf_s build error | 02 September 2013, 07:17:22 UTC |
| 9de9190 | smartsgy | 01 September 2013, 14:54:57 UTC | Fix minGW sprintf_s build error On windows, We should replace snprintf on msvc only. | 01 September 2013, 14:54:57 UTC |
| e65f39e | Jonas Tärnström | 26 August 2013, 13:56:02 UTC | Merge pull request #97 from romuloceccon/missing_decimal_fix Support Python distributions without decimal.py | 26 August 2013, 13:56:02 UTC |
| 1f4b786 | Romulo A. Ceccon | 16 July 2013, 13:10:56 UTC | Fixed support for distributions without decimal.py ujson crashed Python if decimal.py wasn't available. This fix makes ujson ignore the problem and instead assume no Decimal object will be passed in to ujson.dumps(). | 19 August 2013, 11:23:41 UTC |
| 09f290a | Jonas Tärnström | 17 August 2013, 10:51:32 UTC | Merge pull request #94 from Komnomnomnom/whitespace-fix whitespace and formatting fixes for objToJSON.c | 17 August 2013, 10:51:32 UTC |
| cde2be9 | Jonas Tärnström | 17 August 2013, 10:50:56 UTC | Merge pull request #96 from MikeAthene/master Adding more tests | 17 August 2013, 10:50:56 UTC |
| 9a09509 | Jonas Tärnström | 17 August 2013, 10:49:54 UTC | Merge pull request #93 from Komnomnomnom/valgrind-mem-leak Fix invalid memory read (from valgrind) during test_decodeBrokenListLeakTest | 17 August 2013, 10:49:54 UTC |
| 1a0f2a1 | Mikhail Sychev | 08 July 2013, 21:51:20 UTC | Adding more tests - BMP amd symbol encoding/decoding with ensure_ascii set to True and False - True, False and null tests like in cjson/json-py test suite - Empty dict and array tests - Test for tag escaping - Bad dict data test - Minimal cleanups | 08 July 2013, 21:51:20 UTC |
| ce308a1 | Kieran O'Mahony | 19 June 2013, 17:40:24 UTC | Fix invalid memory read (from valgrind) during test_decodeBrokenListLeakTest | 19 June 2013, 17:41:18 UTC |
| 6242c25 | Kieran O'Mahony | 18 June 2013, 13:21:43 UTC | whitespace fix | 18 June 2013, 13:21:43 UTC |
| 08ff81a | Jonas Tarnstrom | 11 June 2013, 06:10:34 UTC | Added explanation text | 11 June 2013, 06:10:34 UTC |
| 4e4dc5e | Jonas Tarnstrom | 11 June 2013, 06:09:57 UTC | Added 2 bytes to the string reservation macro to guaranteed to able to hold the quotes | 11 June 2013, 06:09:57 UTC |
| 4073bab | Jonas Tarnstrom | 10 June 2013, 10:44:04 UTC | Merged (line-by-line prv pointer additions from ujson4c project. Bumped version | 10 June 2013, 10:44:04 UTC |
| 97b3af6 | Jonas Tarnstrom | 10 June 2013, 10:15:22 UTC | Bumped version | 10 June 2013, 10:15:22 UTC |
| 96dda4e | Jonas Tarnstrom | 10 June 2013, 10:14:23 UTC | Fixed C89 build issue in Win32 | 10 June 2013, 10:14:23 UTC |
| 79ac0e9 | Jonas Tarnstrom | 10 June 2013, 10:14:09 UTC | Fixed potential overflow issue with the estimations of string buffer lengths | 10 June 2013, 10:14:09 UTC |
| aa48586 | Jonas Tärnström | 24 May 2013, 13:37:23 UTC | Merge pull request #89 from Infinidat/master bdist_egg | 24 May 2013, 13:37:23 UTC |
| 1910b1d | Guy Rozendorn | 23 May 2013, 14:27:23 UTC | Try to use setuptools, for building eggs | 23 May 2013, 14:27:23 UTC |
| 4f229ee | Jonas Tärnström | 20 May 2013, 06:30:11 UTC | Merge pull request #88 from MikeAthene/master intValue cleanup | 20 May 2013, 06:30:11 UTC |
| 6f731e9 | Mikhail Sychev | 17 May 2013, 23:43:14 UTC | Use uint32 for decoding depth counter. | 17 May 2013, 23:43:14 UTC |
| d194048 | Mikhail Sychev | 17 May 2013, 23:21:43 UTC | Decoding depth limitation/SIGSEGV fix | 17 May 2013, 23:21:43 UTC |
| fbf3f96 | Mikhail Sychev | 16 May 2013, 20:42:54 UTC | Removed intValue negative value checks as intValue is declared as JSUINT64. | 16 May 2013, 20:42:54 UTC |
| c8ead91 | Jonas Tärnström | 15 May 2013, 09:25:15 UTC | Merge pull request #86 from MikeAthene/master More memory allocation checks | 15 May 2013, 09:25:15 UTC |
| 0acd21c | Mikhail Sychev | 14 May 2013, 22:54:35 UTC | Added memory (re)allocation checks. - Guards against memory alloc size overflow. - Memory leak on failed reallocation. | 14 May 2013, 22:54:35 UTC |
| 5710c4b | Jonas Tärnström | 11 May 2013, 08:40:06 UTC | Merge pull request #85 from MikeAthene/master Build improvements. | 11 May 2013, 08:40:06 UTC |
