Skip to content
This repository has been archived by the owner on Mar 8, 2018. It is now read-only.

Update iainb's pull request to merge cleanly + socket support + decode a buffer at a time + bugfixes #38

Open
wants to merge 25 commits into
base: master
Choose a base branch
from

Commits on Jan 25, 2015

  1. moved yajil to 2.0.2

    iainb authored and otherwiseguy committed Jan 25, 2015
    Configuration menu
    Copy the full SHA
    7c83479 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    05eceb9 View commit details
    Browse the repository at this point in the history
  3. * Free prarser on error

    * updated build instructions
    iainb authored and otherwiseguy committed Jan 25, 2015
    Configuration menu
    Copy the full SHA
    dcc1357 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    aa93eac View commit details
    Browse the repository at this point in the history
  5. Incorporate python3 undefined symbol fix from:

    rickeyski@cf3c29d
    
    Move IssueTwentySevenTest dict into python2 to prevent python3 test from bailing on loading the test suite
    
    Update IssueTwentySevenTest to only run on python2. (probably want to run this on python3 too).
    iainb authored and otherwiseguy committed Jan 25, 2015
    Configuration menu
    Copy the full SHA
    95c3618 View commit details
    Browse the repository at this point in the history
  6. Move towards decoding multiple items

    * Store decoded objects in a list
    iainb authored and otherwiseguy committed Jan 25, 2015
    Configuration menu
    Copy the full SHA
    7da9ed4 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    a71b94c View commit details
    Browse the repository at this point in the history
  8. calling len() against the decoder object returns the number of decode…

    …d objects in the internal buffer.
    iainb authored and otherwiseguy committed Jan 25, 2015
    Configuration menu
    Copy the full SHA
    3c0f595 View commit details
    Browse the repository at this point in the history
  9. Add reset() method to decoder

    Remove actions from _internal_decode that reset the parser state
    iainb authored and otherwiseguy committed Jan 25, 2015
    Configuration menu
    Copy the full SHA
    6b2962e View commit details
    Browse the repository at this point in the history
  10. Compiled with clang c compiler, fixed the following warnings:

    clang -fno-strict-aliasing -DNDEBUG -g -fwrapv -O2 -Wall -Wstrict-prototypes -fPIC -I. -Iincludes/ -Iyajl/src -I/usr/include/python2.6 -c yajl.c -o build/temp.linux-x86_64-2.6/yajl.o -Wall -DMOD_VERSION="0.3.6-38862b0"
    yajl.c:411:15: warning: incompatible pointer types initializing 'PyCFunction' (aka 'PyObject *(*)(PyObject *, PyObject *)') with
          an expression of type 'PyCFunctionWithKeywords' (aka 'PyObject *(*)(PyObject *, PyObject *, PyObject *)')
        {"dumps", (PyCFunctionWithKeywords)(py_dumps), METH_VARARGS | METH_KEYWORDS,
                  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    yajl.c:427:14: warning: incompatible pointer types initializing 'PyCFunction' (aka 'PyObject *(*)(PyObject *, PyObject *)') with
          an expression of type 'PyCFunctionWithKeywords' (aka 'PyObject *(*)(PyObject *, PyObject *, PyObject *)')
        {"dump", (PyCFunctionWithKeywords)(py_dump), METH_VARARGS | METH_KEYWORDS,
                 ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    yajl.c:331:18: warning: unused function 'py_iterload' [-Wunused-function]
    static PyObject *py_iterload(PYARGS)
                     ^
    3 warnings generated.
    
    clang -fno-strict-aliasing -DNDEBUG -g -fwrapv -O2 -Wall -Wstrict-prototypes -fPIC -I. -Iincludes/ -Iyajl/src -I/usr/include/python2.6 -c encoder.c -o build/temp.linux-x86_64-2.6/encoder.o -Wall -DMOD_VERSION="0.3.6-38862b0"
    encoder.c:316:9: warning: expression result unused [-Wunused-value]
            PyObject_INIT_VAR(op, &PyString_Type, size);
            ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    In file included from encoder.c:32:
    In file included from /usr/include/python2.6/Python.h:81:
    /usr/include/python2.6/objimpl.h:159:29: note: instantiated from:
        ( Py_SIZE(op) = (size), PyObject_INIT((op), (typeobj)) )
                                ^
    encoder.c:316:9: note: instantiated from:
            PyObject_INIT_VAR(op, &PyString_Type, size);
            ^                 ~~
    encoder.c:316:27: note: instantiated from:
            PyObject_INIT_VAR(op, &PyString_Type, size);
                              ^~
    1 warning generated.
    iainb authored and otherwiseguy committed Jan 25, 2015
    Configuration menu
    Copy the full SHA
    7778ebe View commit details
    Browse the repository at this point in the history
  11. Removed print statement from issue_11.py

    Updated runtests.sh to run issue_11 test under python3
    iainb authored and otherwiseguy committed Jan 25, 2015
    Configuration menu
    Copy the full SHA
    6ebabe4 View commit details
    Browse the repository at this point in the history
  12. Decoder _internal_decode now only decodes, decoded objects can be ret…

    …rieved by _fetchObject
    iainb authored and otherwiseguy committed Jan 25, 2015
    Configuration menu
    Copy the full SHA
    7997e35 View commit details
    Browse the repository at this point in the history
  13. Add ability to iterate over a stream of multiple items:

    To iterate over json items written to the stdin of a python process:
    
    import yajl
    import sys
    
    for i in yajl.Decoder(allow_multiple_values=True,stream=sys.stdin):
        print i
    
    Python3 support is broken in this build.
    iainb authored and otherwiseguy committed Jan 25, 2015
    Configuration menu
    Copy the full SHA
    4c5f49b View commit details
    Browse the repository at this point in the history
  14. Fix python 3 support

    iainb authored and otherwiseguy committed Jan 25, 2015
    Configuration menu
    Copy the full SHA
    13daf3f View commit details
    Browse the repository at this point in the history
  15. Fix Decref issue

    Refactor py_yajldecoder_decode
    iainb authored and otherwiseguy committed Jan 25, 2015
    Configuration menu
    Copy the full SHA
    f24fd21 View commit details
    Browse the repository at this point in the history
  16. refactor _internal_stream_load to use Decoder class

    add check to decoder init function to check stream has read() method
    iainb authored and otherwiseguy committed Jan 25, 2015
    Configuration menu
    Copy the full SHA
    bb7051a View commit details
    Browse the repository at this point in the history
  17. Configuration menu
    Copy the full SHA
    dfb1fff View commit details
    Browse the repository at this point in the history
  18. Configuration menu
    Copy the full SHA
    a1df295 View commit details
    Browse the repository at this point in the history
  19. Fix many memory leaks relating to reference counts

    Also fix functions which were returning true/false/none types but not incrementing the refcount
    iainb authored and otherwiseguy committed Jan 25, 2015
    Configuration menu
    Copy the full SHA
    d9ae130 View commit details
    Browse the repository at this point in the history
  20. Fixed memory leak in encoder.c ProcessObject

    Unicode buffer was not being freed after use
    iainb authored and otherwiseguy committed Jan 25, 2015
    Configuration menu
    Copy the full SHA
    d9975b3 View commit details
    Browse the repository at this point in the history
  21. Configuration menu
    Copy the full SHA
    77a3e6d View commit details
    Browse the repository at this point in the history
  22. Configuration menu
    Copy the full SHA
    2d43150 View commit details
    Browse the repository at this point in the history
  23. Configuration menu
    Copy the full SHA
    7136180 View commit details
    Browse the repository at this point in the history

Commits on Jan 26, 2015

  1. Configuration menu
    Copy the full SHA
    23f7342 View commit details
    Browse the repository at this point in the history

Commits on Jan 27, 2015

  1. Configuration menu
    Copy the full SHA
    c7aa8b6 View commit details
    Browse the repository at this point in the history