Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Replace all remaining six usage with native Python 3 equivalents #7704

Merged
merged 12 commits into from
Jun 16, 2020
Merged

Replace all remaining six usage with native Python 3 equivalents #7704

merged 12 commits into from
Jun 16, 2020

Commits on Jun 15, 2020

  1. Replace uses of six.int_types/binary_type/string_types 

    Use native Python 3 `int`/`bytes`/`str` instead.

Signed-off-by: Dagfinn Ilmari Mannsåker <ilmari@ilmari.org>
    @ilmari
    ilmari committed Jun 15, 2020
    Configuration menu
    Copy the full SHA
    e5a4809 View commit details
    Browse the repository at this point in the history

  2. Replace six.StringIO with io.StringIO 

    Signed-off-by: Dagfinn Ilmari Mannsåker <ilmari@ilmari.org>
    @ilmari
    ilmari committed Jun 15, 2020
    Configuration menu
    Copy the full SHA
    7458fa2 View commit details
    Browse the repository at this point in the history

  3. Replace six.raise_from() with raise … from 

    Signed-off-by: Dagfinn Ilmari Mannsåker <ilmari@ilmari.org>
    @ilmari
    ilmari committed Jun 15, 2020
    Configuration menu
    Copy the full SHA
    286a120 View commit details
    Browse the repository at this point in the history

  4. Replace six.reraise() with plain raise 

    In Python 3 the exception carries its own traceback,
so no need to explicitly preserve it.

Signed-off-by: Dagfinn Ilmari Mannsåker <ilmari@ilmari.org>
    @ilmari
    ilmari committed Jun 15, 2020
    Configuration menu
    Copy the full SHA
    277ca79 View commit details
    Browse the repository at this point in the history

  5. Replace final six.iteritems() with .items() 

    Signed-off-by: Dagfinn Ilmari Mannsåker <ilmari@ilmari.org>
    @ilmari
    ilmari committed Jun 15, 2020
    Configuration menu
    Copy the full SHA
    64833ba View commit details
    Browse the repository at this point in the history

  6. Stop importing builtins from six

    @ilmari
    ilmari committed Jun 15, 2020
    Configuration menu
    Copy the full SHA
    c5af234 View commit details
    Browse the repository at this point in the history

  7. Import intern from sys instead of six

    @ilmari
    ilmari committed Jun 15, 2020
    Configuration menu
    Copy the full SHA
    61f98e9 View commit details
    Browse the repository at this point in the history

  8. Import urllib directly, rather than via six.moves

    @ilmari
    ilmari committed Jun 15, 2020
    Configuration menu
    Copy the full SHA
    68e3153 View commit details
    Browse the repository at this point in the history

  9. Import http.HTTPStatus directly, rather than via six.moves 

    `six.moves.http_client` was only being imported for the HTTP status
codes, so just import that class directly instead.
    @ilmari
    ilmari committed Jun 15, 2020
    Configuration menu
    Copy the full SHA
    b0d5297 View commit details
    Browse the repository at this point in the history

  10. Import queue directly, rather than via six.moves

    @ilmari
    ilmari committed Jun 15, 2020
    Configuration menu
    Copy the full SHA
    79ca7c7 View commit details
    Browse the repository at this point in the history

  11. Remove dependency on six

    @ilmari
    ilmari committed Jun 15, 2020
    Configuration menu
    Copy the full SHA
    5497611 View commit details
    Browse the repository at this point in the history

  12. Add changelog entry 

    Signed-off-by: Dagfinn Ilmari Mannsåker <ilmari@ilmari.org>
    @ilmari
    ilmari committed Jun 15, 2020
    Configuration menu
    Copy the full SHA
    bdbb3a8 View commit details
    Browse the repository at this point in the history