Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ENH: add ujson support in pandas.io.json #3804

Merged
merged 10 commits into from
Jun 11, 2013
Merged

ENH: add ujson support in pandas.io.json #3804

merged 10 commits into from
Jun 11, 2013

Commits on Jun 11, 2013

  1. ENH: pull pandasjson back into pandas

    @wesm @jreback
    wesm authored and jreback committed Jun 11, 2013
    Configuration menu
    Copy the full SHA
    e31f839 View commit details
    Browse the repository at this point in the history

  2. DOC: add ultrajson license

    @wesm @jreback
    wesm authored and jreback committed Jun 11, 2013
    Configuration menu
    Copy the full SHA
    8327c5b View commit details
    Browse the repository at this point in the history

  3. TST: json manip test script. and trigger travis

    @wesm @jreback
    wesm authored and jreback committed Jun 11, 2013
    Configuration menu
    Copy the full SHA
    ade5d0f View commit details
    Browse the repository at this point in the history

  4. BLD: fix setup.py to work on current pandas

    @jreback
    jreback committed Jun 11, 2013
    Configuration menu
    Copy the full SHA
    9633880 View commit details
    Browse the repository at this point in the history

  5. CLN: revised json support to use the to_json/read_json in pandas.io.json 

    DOC: docs in io.rst/whatsnew/release notes/api

TST: cleaned up cruft in test_series/test_frame
    @jreback
    jreback committed Jun 11, 2013
    Configuration menu
    Copy the full SHA
    7dd12cc View commit details
    Browse the repository at this point in the history

  6. DOC: io.rst doc updates

    @jreback
    jreback committed Jun 11, 2013
    Configuration menu
    Copy the full SHA
    a9dafe3 View commit details
    Browse the repository at this point in the history

  7. API: to_json now writes to a file by default (if None is provided it … 

    …will return a StringIO object)

     read_json will read from a string-like or filebuf or url (consistent with other parsers)
    @jreback
    jreback committed Jun 11, 2013
    Configuration menu
    Copy the full SHA
    6422041 View commit details
    Browse the repository at this point in the history

  8. ENH: removed json argument, now path_or_buf can be a path,buffer,url,… 

    …or JSON string

     added keywords parse_dates,keep_default_dates to allow for date parsing in columns
     of a Frame (default is False, not to parse dates)
    @jreback
    jreback committed Jun 11, 2013
    Configuration menu
    Copy the full SHA
    8e673cf View commit details
    Browse the repository at this point in the history

  9. ENH: added date_format parm to to_josn to allow epoch or iso formats … 

    …(which both can be

     can be parsed with parse_dates=True in read_json)
    @jreback
    jreback committed Jun 11, 2013
    Configuration menu
    Copy the full SHA
    2697b49 View commit details
    Browse the repository at this point in the history

  10. BUG: patch in weird nested decoding issue, courtesy of @Komnomnomnom

    @jreback
    jreback committed Jun 11, 2013
    Configuration menu
    Copy the full SHA
    8e4314d View commit details
    Browse the repository at this point in the history