Permalink
Switch branches/tags
Nothing to show
Commits on Mar 29, 2017
  1. Merge pull request #260 from markpiekarz/patch-1

    Update ultrajsondec.c
    Jahaja committed on GitHub Mar 29, 2017
  2. Update ultrajsondec.c

    Explicitly include stdint.h to define SIZE_MAX.
    markpiekarz committed on GitHub Mar 29, 2017
Commits on Mar 14, 2017
  1. Merge pull request #255 from adamchainz/patch-1

    Add syntax highlighting to README
    Jahaja committed on GitHub Mar 14, 2017
Commits on Mar 12, 2017
  1. Add syntax highlighting to README

    adamchainz committed on GitHub Mar 12, 2017
Commits on Feb 14, 2017
  1. Integrated google's double-conversion lib

    To fix issues with floating-point precision we've made use of Google's
    double-conversion lib to handle conversions of doubles to and from strings.
    
    In addition to fixing our precision problems this will improve double
    encoding by 4-5x. Decoding is however slightly slower according to the
    benchmarks - but accurate at least.
    
    This change removes the double_precision encoding option and the
    precise_float decoding option.
    Jahaja committed Feb 14, 2017
Commits on Feb 7, 2017
Commits on Feb 6, 2017
  1. Removed blist tests

    Jahaja committed Feb 6, 2017
  2. Removed serialization of date/datetime objects

    To better align with the standard json module this removes ujson
    default serialization of date/datetime objects to unix-timestamps.
    
    Trying to serialize such an object will now raise a TypeError "repr(obj)
    is not JSON serializable".
    Jahaja committed Feb 6, 2017
  3. Removed support for __json__ method on str

    This functionality caused a performance regression without a use-case
    justifying the trade-off.
    Jahaja committed Feb 6, 2017
  4. Removed generic serialization of objects/iterables

    The behavior of ujson has always been to try to serialize all objects in
    any way possible. This has been quite a deviation from other json
    libraries, including Pythons standard json module, and the source of a
    lot of confusion and bugs. Removing this quirk moves ultrajson closer to
    the expected behavior.
    
    Instead of trying to coerce serialization ultrajson will now throw a
    TypeError: "repr(obj) is not JSON serializable" exception.
    Jahaja committed Feb 6, 2017
Commits on Feb 4, 2017
  1. Following std json handling of None dict key

    Previously a None dict item key would be outputted in JSON as "None".
    To better align with the standard json module this was changed to output
    "null". There's no proper representation of null object keys in JSON so
    this is implementation specific but it seems more natural to follow
    suit when it can be done without a significant performance hit.
    
    Added and used branch prediction macros (LIKELY/UNLIKELY) as well.
    Jahaja committed Feb 4, 2017
  2. Fix for overflowing long causing invalid json

    This was caused by checking for "__json__" using PyObject_HasAttrString
    which clears the error set by a previous long overflow. Thus this was dependent
    on the order of processing of dict items, which explains why it was
    seemingly random as the dict items are likely ordered by a hash of
    the key.
    
    This fixes GH224 and GH240.
    Jahaja committed Feb 4, 2017
  3. Fixes for sort_keys bug and a typo.

        - Fixed segfault when using sort_keys=True on dict with unorderable keys (GH247)
    
        - Fixed refcount becoming negative when using sort_keys=True (GH243)
    
        - Fixed compile error when defining JSON_NO_EXTRA_WHITESPACE
          caused by a wrongly named variable. (GH245)
    Jahaja committed Feb 4, 2017
Commits on Oct 10, 2016
  1. Merge pull request #217 from orivej/indent-dict-values

    Indent dict values
    Jahaja committed on GitHub Oct 10, 2016
  2. Merge pull request #238 from WGH-/static-functions

    added "static" to C functions, where possible
    Jahaja committed on GitHub Oct 10, 2016
Commits on Aug 27, 2016
  1. added "static" to C functions, where possible

    1. It reduces clutter in symbol table.
    2. It fixes issues with C99 inline semantics for functions
       marked as inline (#237, #180, #222), which manifests
       when compiled with GCC>=5.
    WGH- committed Aug 27, 2016
Commits on Aug 21, 2016
  1. Merge pull request #234 from rdpate/patch-1

    bring back benchmark introduction
    Jahaja committed on GitHub Aug 21, 2016
Commits on Aug 20, 2016
  1. bring back benchmark introduction

    rdpate committed on GitHub Aug 20, 2016
Commits on Apr 3, 2016
  1. Indent dict values

    orivej committed Apr 3, 2016
Commits on Jan 26, 2016
  1. Merge pull request #207 from anthraxx/master

    do not forcefully remove the build directory manually (fix #179)
    Jahaja committed Jan 26, 2016
  2. do not forcefully remove the build directory manually

    this fixes issue #179.
    setuptools should itself know when to use cache or create a
    new build... however if someone wants to override that, it's
    still possible but forcefully doing that on whatever
    setuptools target will (and does) introduce problems.
    
    Build directory should be cleaned up via the clean sub-command.
    examples:
    - clean up temp:
      python setup.py clean
    - clean up whole build dir
      python setup.py clean -a
    
    Or if somebody wants to, the build dir could be removed on the
    shell.
    anthraxx committed Jan 26, 2016
Commits on Jan 20, 2016
Commits on Jan 18, 2016
  1. Fixed assertRegex error on python 2 and checking if nose2.collector w…

    …orks with python 2.6
    Jahaja committed Jan 18, 2016
  2. Bumping version to 1.35

    Jahaja committed Jan 18, 2016
  3. Merge branch 'ngandhy-master'

    Jahaja committed Jan 18, 2016
  4. Merge branch 'master' of https://github.com/ngandhy/ultrajson into ng…

    …andhy-master
    
    Conflicts:
    	tests/tests.py
    Jahaja committed Jan 18, 2016
  5. Merge branch 'correct_unit_tests_and_benchmarks' of https://github.co…

    …m/timdawborn/ultrajson into timdawborn-correct_unit_tests_and_benchmarks
    
    Conflicts:
    	tests/tests.py
    Jahaja committed Jan 18, 2016
Commits on Jan 15, 2016
  1. Merge pull request #157 from wlanslovenija/raw-json

    If an object has a __json__ method, use it when encoding
    Jahaja committed Jan 15, 2016