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

Make application code Python 3 compliant #4239

Merged
merged 47 commits into from
Apr 16, 2019
Merged

Make application code Python 3 compliant #4239

merged 47 commits into from
Apr 16, 2019

Commits on Apr 15, 2019

  1. Updates Dockerfile for Python3 environment

    @kushaldas @redshiftzero
    kushaldas authored and redshiftzero committed Apr 15, 2019
    Configuration menu
    Copy the full SHA
    f99b211 View commit details
    Browse the repository at this point in the history

  2. Uses py.test executable for tests

    @kushaldas @redshiftzero
    kushaldas authored and redshiftzero committed Apr 15, 2019
    Configuration menu
    Copy the full SHA
    5b7d08d View commit details
    Browse the repository at this point in the history

  3. Uses Python3 to create dev config

    @kushaldas @redshiftzero
    kushaldas authored and redshiftzero committed Apr 15, 2019
    Configuration menu
    Copy the full SHA
    5432a48 View commit details
    Browse the repository at this point in the history

  4. Uses BytesIO for svg 

    In Python3 we need to use BytesIO and then later convert
bytes to string for viewing svg QR code on the browser.
    @kushaldas @redshiftzero
    kushaldas authored and redshiftzero committed Apr 15, 2019
    Configuration menu
    Copy the full SHA
    cbe3f25 View commit details
    Browse the repository at this point in the history

  5. Uses Python3 interpreter

    @kushaldas @redshiftzero
    kushaldas authored and redshiftzero committed Apr 15, 2019
    Configuration menu
    Copy the full SHA
    2490ba7 View commit details
    Browse the repository at this point in the history

  6. Returns str instead of bytes in Python3

    @kushaldas @redshiftzero
    kushaldas authored and redshiftzero committed Apr 15, 2019
    Configuration menu
    Copy the full SHA
    88f3049 View commit details
    Browse the repository at this point in the history

  7. Mass update from 2to3 tool of the source

    @kushaldas @redshiftzero
    kushaldas authored and redshiftzero committed Apr 15, 2019
    Configuration menu
    Copy the full SHA
    c00fdc7 View commit details
    Browse the repository at this point in the history

  8. Mass update of tests using 2to3 tool

    @kushaldas @redshiftzero
    kushaldas authored and redshiftzero committed Apr 15, 2019
    Configuration menu
    Copy the full SHA
    5a2e66f View commit details
    Browse the repository at this point in the history

  9. Fixes crypto_util tests for python3

    @kushaldas @redshiftzero
    kushaldas authored and redshiftzero committed Apr 15, 2019
    Configuration menu
    Copy the full SHA
    14bebc3 View commit details
    Browse the repository at this point in the history

  10. Fixes bytes vs strings for Python3 

    Also fixes the import statement for Python3
    @kushaldas @redshiftzero
    kushaldas authored and redshiftzero committed Apr 15, 2019
    Configuration menu
    Copy the full SHA
    d4840a7 View commit details
    Browse the repository at this point in the history

  11. Fixes bytes vs strings for the i18n tool

    @kushaldas @redshiftzero
    kushaldas authored and redshiftzero committed Apr 15, 2019
    Configuration menu
    Copy the full SHA
    e31e212 View commit details
    Browse the repository at this point in the history

  12. Fixes rq on Python3 

    Requires any locale other than posix for click
module.
    @kushaldas @redshiftzero
    kushaldas authored and redshiftzero committed Apr 15, 2019
    Configuration menu
    Copy the full SHA
    bfed0d1 View commit details
    Browse the repository at this point in the history

  13. Fixes for bytes vs strings in Python3

    @kushaldas @redshiftzero
    kushaldas authored and redshiftzero committed Apr 15, 2019
    Configuration menu
    Copy the full SHA
    c0a60a9 View commit details
    Browse the repository at this point in the history

  14. Uses binascii.Error as the actual error in exception

    @kushaldas @redshiftzero
    kushaldas authored and redshiftzero committed Apr 15, 2019
    Configuration menu
    Copy the full SHA
    a7847d3 View commit details
    Browse the repository at this point in the history

  15. Fixes bytes vs strings for Python3

    @kushaldas @redshiftzero
    kushaldas authored and redshiftzero committed Apr 15, 2019
    Configuration menu
    Copy the full SHA
    7fbefcb View commit details
    Browse the repository at this point in the history

  16. Fixes encrypted reply file opening as text file 

    The encrypted data is already encoded to ascii, so we
can just save it with `open(filename,'w')` file.
    @kushaldas @redshiftzero
    kushaldas authored and redshiftzero committed Apr 15, 2019
    Configuration menu
    Copy the full SHA
    0539017 View commit details
    Browse the repository at this point in the history

  17. Fixes bytes vs strings for Python3

    @kushaldas @redshiftzero
    kushaldas authored and redshiftzero committed Apr 15, 2019
    Configuration menu
    Copy the full SHA
    64308a2 View commit details
    Browse the repository at this point in the history

  18. Python3 stdout takes care of the QR code

    @kushaldas @redshiftzero
    kushaldas authored and redshiftzero committed Apr 15, 2019
    Configuration menu
    Copy the full SHA
    3f07500 View commit details
    Browse the repository at this point in the history

  19. Fixes tests by mocking builtins.input function 

    This is the correct input method name.
    @kushaldas @redshiftzero
    kushaldas authored and redshiftzero committed Apr 15, 2019
    Configuration menu
    Copy the full SHA
    fefd614 View commit details
    Browse the repository at this point in the history

  20. Uses bytes on Python3

    @kushaldas @redshiftzero
    kushaldas authored and redshiftzero committed Apr 15, 2019
    Configuration menu
    Copy the full SHA
    8c91695 View commit details
    Browse the repository at this point in the history

  21. Fixes bytes vs strings for Python3

    @kushaldas @redshiftzero
    kushaldas authored and redshiftzero committed Apr 15, 2019
    Configuration menu
    Copy the full SHA
    d152ea7 View commit details
    Browse the repository at this point in the history

  22. Fixes import path for Python3

    @kushaldas @redshiftzero
    kushaldas authored and redshiftzero committed Apr 15, 2019
    Configuration menu
    Copy the full SHA
    15e443f View commit details
    Browse the repository at this point in the history

  23. Fixes bytes vs strings for Python3

    @kushaldas @redshiftzero
    kushaldas authored and redshiftzero committed Apr 15, 2019
    Configuration menu
    Copy the full SHA
    2b50b0b View commit details
    Browse the repository at this point in the history

  24. Fixes bytes vs strings for Python3

    @kushaldas @redshiftzero
    kushaldas authored and redshiftzero committed Apr 15, 2019
    Configuration menu
    Copy the full SHA
    7eb87be View commit details
    Browse the repository at this point in the history

  25. dockerfiles: add python2 and python3 dockerfiles

    @redshiftzero
    redshiftzero committed Apr 15, 2019
    Configuration menu
    Copy the full SHA
    fc1dd67 View commit details
    Browse the repository at this point in the history

  26. ci: add application test run on python 3 (xenial only)

    @redshiftzero
    redshiftzero committed Apr 15, 2019
    Configuration menu
    Copy the full SHA
    ac92d2a View commit details
    Browse the repository at this point in the history

  27. dockerfile: move trusty dockerfile into python2 dir

    @redshiftzero
    redshiftzero committed Apr 15, 2019
    Configuration menu
    Copy the full SHA
    5935641 View commit details
    Browse the repository at this point in the history

  28. dev: add python 2 / 3 functionality to dev env

    @redshiftzero
    redshiftzero committed Apr 15, 2019
    Configuration menu
    Copy the full SHA
    945211d View commit details
    Browse the repository at this point in the history

  29. dev: add makefile target for running test suite under python 3

    @redshiftzero
    redshiftzero committed Apr 15, 2019
    Configuration menu
    Copy the full SHA
    8a8ca22 View commit details
    Browse the repository at this point in the history

  30. dev: remove ticker

    @redshiftzero
    redshiftzero committed Apr 15, 2019
    Configuration menu
    Copy the full SHA
    80b5a93 View commit details
    Browse the repository at this point in the history

  31. python 2/3 compatibility: revert when python 3 is ready for prod 

    this commit reverts changes in python->python3, which can only
be deployed when python3 changes are ready for prod. For now, we
plan on having both python2 and python3 compatibility, and we will
update the shebangs to point to /usr/bin/env python3 when we
remove support for python2 and deploy python3 to prod (to be done
in a single release).
    @redshiftzero
    redshiftzero committed Apr 15, 2019
    Configuration menu
    Copy the full SHA
    bf5460d View commit details
    Browse the repository at this point in the history

  32. python 2/3 compatibility: update remainder of imports

    @redshiftzero
    redshiftzero committed Apr 15, 2019
    Configuration menu
    Copy the full SHA
    8e0aeb7 View commit details
    Browse the repository at this point in the history

  33. python 2/3 compatibility: fix test_api_error_handlers_defined

    @redshiftzero
    redshiftzero committed Apr 15, 2019
    Configuration menu
    Copy the full SHA
    41ef260 View commit details
    Browse the repository at this point in the history

  34. round of flake8 fixes

    @redshiftzero
    redshiftzero committed Apr 15, 2019
    Configuration menu
    Copy the full SHA
    5335bb2 View commit details
    Browse the repository at this point in the history

  35. python 2/3 compatibility: use input() from six 

    (bandit will flag the use of input() in python 2 as a high severity
security issue otherwise)

Also adds a wrapper as a workaround for
pytest-dev/pytest#1598
    @redshiftzero
    redshiftzero committed Apr 15, 2019
    Configuration menu
    Copy the full SHA
    0af962c View commit details
    Browse the repository at this point in the history

  36. Uses six to work on both Python2 and 3

    @kushaldas @redshiftzero
    kushaldas authored and redshiftzero committed Apr 15, 2019
    Configuration menu
    Copy the full SHA
    f3855ae View commit details
    Browse the repository at this point in the history

  37. Assert based on python2 or python3

    @kushaldas @redshiftzero
    kushaldas authored and redshiftzero committed Apr 15, 2019
    Configuration menu
    Copy the full SHA
    a669aa4 View commit details
    Browse the repository at this point in the history

  38. Uses six for both Python2 and Python3

    @kushaldas @redshiftzero
    kushaldas authored and redshiftzero committed Apr 15, 2019
    Configuration menu
    Copy the full SHA
    a9b75fd View commit details
    Browse the repository at this point in the history

  39. Uses six for both Python2 and Python3

    @kushaldas @redshiftzero
    kushaldas authored and redshiftzero committed Apr 15, 2019
    Configuration menu
    Copy the full SHA
    08c6301 View commit details
    Browse the repository at this point in the history

  40. Uses six for unicode in Python2 and Python3

    @kushaldas @redshiftzero
    kushaldas authored and redshiftzero committed Apr 15, 2019
    Configuration menu
    Copy the full SHA
    14f5cc7 View commit details
    Browse the repository at this point in the history

  41. Fixes code formatting for CI

    @kushaldas @redshiftzero
    kushaldas authored and redshiftzero committed Apr 15, 2019
    Configuration menu
    Copy the full SHA
    45b6351 View commit details
    Browse the repository at this point in the history

  42. Updates code branching for Python2 vs Python3 

    Based on code review and easy code reading of the branches.
    @kushaldas @redshiftzero
    kushaldas authored and redshiftzero committed Apr 15, 2019
    Configuration menu
    Copy the full SHA
    2030779 View commit details
    Browse the repository at this point in the history

  43. python 2/3 compatibility: use six.text_type where possible

    @redshiftzero
    redshiftzero committed Apr 15, 2019
    Configuration menu
    Copy the full SHA
    9e8b6b1 View commit details
    Browse the repository at this point in the history

  44. python 2/3 compatibility: use six.BytesIO in test_submit_file

    @redshiftzero
    redshiftzero committed Apr 15, 2019
    Configuration menu
    Copy the full SHA
    f39195f View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2019

  1. docs: explain how to use dev env and run tests on either py2 or 3

    @redshiftzero
    redshiftzero committed Apr 16, 2019
    Configuration menu
    Copy the full SHA
    3606e48 View commit details
    Browse the repository at this point in the history

  2. python 2/3 compatibility: cleaning up nits before merge

    @redshiftzero
    redshiftzero committed Apr 16, 2019
    Configuration menu
    Copy the full SHA
    3d3e0d8 View commit details
    Browse the repository at this point in the history

  3. ci: fix app-test job, DRY up docker layer cache loading

    @redshiftzero
    redshiftzero committed Apr 16, 2019
    Configuration menu
    Copy the full SHA
    44e8d06 View commit details
    Browse the repository at this point in the history