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

Python 3 and Django 1.5 support #308

Merged
merged 10 commits into from
Feb 27, 2013
Merged

Python 3 and Django 1.5 support #308

merged 10 commits into from
Feb 27, 2013

Commits on Feb 24, 2013

  1. convert doctests to unittests and only run uuid tests if uuid is not … 

    …shipped with python (version < 2.5)
    @fhahn
    fhahn committed Feb 24, 2013
    Configuration menu
    Copy the full SHA
    540f367 View commit details
    Browse the repository at this point in the history

  2. add six to install_requires, refs #288

    @fhahn
    fhahn committed Feb 24, 2013
    Configuration menu
    Copy the full SHA
    005a723 View commit details
    Browse the repository at this point in the history

  3. add conditional imports for force_unicode and use six for python 3 su… 

    …pport, refs #288
    @fhahn
    fhahn committed Feb 24, 2013
    Configuration menu
    Copy the full SHA
    a967e01 View commit details
    Browse the repository at this point in the history

  4. use as in except, refs #288

    @fhahn
    fhahn committed Feb 24, 2013
    Configuration menu
    Copy the full SHA
    63425f0 View commit details
    Browse the repository at this point in the history

  5. conditional StringIO import, refs #288

    @fhahn
    fhahn committed Feb 24, 2013
    Configuration menu
    Copy the full SHA
    ceb81f0 View commit details
    Browse the repository at this point in the history

  6. update django version for tox, refs #288

    @fhahn
    fhahn committed Feb 24, 2013
    Configuration menu
    Copy the full SHA
    70535e4 View commit details
    Browse the repository at this point in the history

  7. add tests for Django 1.5 and Python 2.6, 2.7 and 3.3, refs #288

    @fhahn
    fhahn committed Feb 24, 2013
    Configuration menu
    Copy the full SHA
    42ac381 View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2013

  1. Fixed some pep8 errors

    @fhahn
    fhahn committed Feb 25, 2013
    Configuration menu
    Copy the full SHA
    dfc6c84 View commit details
    Browse the repository at this point in the history

  2. Added Python 3 and Django 1.5c2 to travis.yml 

    refs #288
    @fhahn
    fhahn committed Feb 25, 2013
    Configuration menu
    Copy the full SHA
    85a02fd View commit details
    Browse the repository at this point in the history

  3. Used unittest imports from Django, refs #288

    @fhahn
    fhahn committed Feb 25, 2013
    Configuration menu
    Copy the full SHA
    7a72cba View commit details
    Browse the repository at this point in the history