Skip to content
This repository was 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
clokep merged 12 commits intomatrix-org:developfrom
ilmari:more-six-removal
Jun 16, 2020
Merged

Replace all remaining six usage with native Python 3 equivalents#7704
clokep merged 12 commits intomatrix-org:developfrom
ilmari:more-six-removal

Conversation

@ilmari
Copy link
Contributor

@ilmari ilmari commented Jun 15, 2020 •
edited
Loading

Pull Request Checklist

  • Pull request is based on the develop branch
  • Pull request includes a changelog file. The entry should:
    • Be a short description of your change which makes sense to users. "Fixed a bug that prevented receiving messages from other servers." instead of "Moved X method from EventStore to EventWorkerStore.".
    • Use markdown where necessary, mostly for code blocks.
    • End with either a period (.) or an exclamation mark (!).
    • Start with a capital letter.
  • Pull request includes a sign off
  • Code style is correct (run the linters)

ilmari added 5 commits June 15, 2020 22:33
@ilmari
Replace uses of six.int_types/binary_type/string_types
e5a4809 
Use native Python 3 `int`/`bytes`/`str` instead.

Signed-off-by: Dagfinn Ilmari Mannsåker <ilmari@ilmari.org>
@ilmari
Replace six.StringIO with io.StringIO
7458fa2 
Signed-off-by: Dagfinn Ilmari Mannsåker <ilmari@ilmari.org>
@ilmari
Replace six.raise_from() with raise … from
286a120 
Signed-off-by: Dagfinn Ilmari Mannsåker <ilmari@ilmari.org>
@ilmari
Replace six.reraise() with plain raise
277ca79 
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
Replace final six.iteritems() with .items()
64833ba 
Signed-off-by: Dagfinn Ilmari Mannsåker <ilmari@ilmari.org>
@clokep clokep self-assigned this Jun 15, 2020
@clokep clokep self-requested a review June 15, 2020 21:47
clokep
clokep reviewed Jun 15, 2020
View reviewed changes
@clokep clokep self-requested a review June 15, 2020 21:48
@ilmari ilmari changed the title More six removal Replace all remaining six usage with native Python 3 equivalents Jun 15, 2020
clokep
clokep approved these changes Jun 16, 2020
View reviewed changes
Copy link
Member

@clokep clokep left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. Thank you!

@clokep clokep merged commit a3f1156 into matrix-org:develop Jun 16, 2020
@ilmari ilmari deleted the more-six-removal branch June 16, 2020 13:13
@clokep clokep mentioned this pull request Jun 16, 2020
Closed
babolivier pushed a commit that referenced this pull request Sep 1, 2021
@anoadragon453
Merge commit 'a3f11567d' into dinsic
48e7f21 
* commit 'a3f11567d':
  Replace all remaining six usage with native Python 3 equivalents (#7704)
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

1 more reviewer

@clokep clokep clokep approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@clokep clokep

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@ilmari @clokep