Permalink
Switch branches/tags
Nothing to show
Commits on Jan 15, 2016
  1. Merge pull request #191 from joshkel/master

    Update tests for floating point inaccuracies
    Jahaja committed Jan 15, 2016
  2. Merge pull request #203 from timdawborn/sort_keys_memory_leak

    Corrected memory leak in sort_keys=True
    Jahaja committed Jan 15, 2016
  3. Merge pull request #136 from b4hand/fix-typo

    Fix typo.
    Jahaja committed Jan 15, 2016
  4. Merge pull request #195 from aebrahim/patch-1

    Test on python 3.5 on travis
    Jahaja committed Jan 15, 2016
  5. Merge pull request #186 from shashurup/master

    escape_forward_slashes now only ignores forward slashes, not everythi…
    Jahaja committed Jan 15, 2016
Commits on Dec 29, 2015
  1. * 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.
    timdawborn committed Dec 29, 2015
Commits on Dec 28, 2015
Commits on Dec 1, 2015
Commits on Nov 30, 2015
Commits on Oct 15, 2015
  1. 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.
    joshkel committed Oct 15, 2015
Commits on Sep 29, 2015
  1. Fixed test for escape_forward_slashes=False

    georgy committed Sep 29, 2015
Commits on Sep 8, 2015
  1. escape_forward_slashes now only ignores forward slashes, not everythi…

    …ng else
    Georgy Kibardin committed Sep 8, 2015
Commits on Apr 9, 2015
  1. Merge branch 'indent'

    Jahaja committed Apr 9, 2015
  2. Support for space indent for JSON encoding

    Chris Huang committed with Jahaja Feb 27, 2015
  3. Added test for sort keys

    Jahaja committed Apr 9, 2015
Commits on Apr 8, 2015
  1. Merge pull request #166 from leplatrem/option_disable_escape_slashes

    Add option to disable forward slash escape
    Jahaja committed Apr 8, 2015
Commits on Apr 6, 2015
  1. Merge pull request #159 from methane/faster-ascii-encode

    Faster ascii encode
    Jahaja committed Apr 6, 2015
Commits on Mar 31, 2015
  1. Add option to disable forward slash escape

    Ref issue #144
    leplatrem committed Mar 31, 2015
Commits on Dec 29, 2014
  1. 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.
    mitar committed Dec 19, 2014
Commits on Dec 26, 2014
  1. Don't use deprecated PyUnicode_EncodeUTF8()

    methane committed Dec 25, 2014
Commits on Dec 25, 2014
  1. Merge pull request #158 from methane/patch-1

    Use new Docker based Travis-CI
    Jahaja committed Dec 25, 2014
  2. 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.
    methane committed Dec 25, 2014
Commits on Nov 13, 2014
  1. Merge pull request #142 from kevinbirch/support_unsigned_long_numerics

    Support values between [0, 2^64 - 1]
    Jahaja committed Nov 13, 2014
Commits on Nov 11, 2014
Commits on Nov 7, 2014
Commits on Oct 31, 2014
  1. Triggering a Travis CI build.

    Jahaja committed Oct 31, 2014
Commits on Oct 30, 2014
  1. Setting up Travis CI

    Jahaja committed Oct 30, 2014