This repository has been archived by the owner on Apr 26, 2024. It is now read-only.
Port handlers/ to Python 3 #3803
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
erikjohnston
previously requested changes
Sep 6, 2018
changelog.d/3803.misc
Outdated
| @@ -0,0 +1 @@ | |||
| storage/ is now ported to Python 3. | |||
| ) | ||
|
|
||
| if stored_hash: | ||
| if not isinstance(stored_hash, bytes): | ||
| stored_hash = stored_hash.encode('ascii') |
There was a problem hiding this comment.
I assume changing from using 'utf8' to 'ascii' is fine?
There was a problem hiding this comment.
The hashes are ASCII hex, so yes.
| @@ -330,7 +330,8 @@ def _upload_one_time_keys_for_user(self, user_id, device_id, time_now, | |||
| (algorithm, key_id, ex_json, key) | |||
| ) | |||
| else: | |||
| new_keys.append((algorithm, key_id, encode_canonical_json(key))) | |||
| new_keys.append(( | |||
| algorithm, key_id, encode_canonical_json(key).decode('ascii'))) | |||
There was a problem hiding this comment.
Nit picky, but this is quite unreadable to me at the end, can you stick the trailing )) on a newline?
There was a problem hiding this comment.
can we save that for running black on things? :)
There was a problem hiding this comment.
Sure, so long as we do do it
synapse/handlers/e2e_keys.py
Outdated
| @@ -358,7 +359,7 @@ def _exception_to_failure(e): | |||
| # Note that some Exceptions (notably twisted's ResponseFailed etc) don't | |||
| # give a string for e.message, which json then fails to serialize. | |||
| return { | |||
| "status": 503, "message": str(e.message), | |||
| "status": 503, "message": str(e.args[0]), | |||
There was a problem hiding this comment.
don't exceptions have a message?
There was a problem hiding this comment.
not on python 3, .message is removed
There was a problem hiding this comment.
Can we just do str(e) tbh, otherwise it feels a bit too awful
erikjohnston
approved these changes
Sep 6, 2018
hawkowl
added a commit
that referenced
this pull request
Sep 24, 2018
Features -------- - Python 3.5 and 3.6 support is now in beta. ([\#3576](#3576)) - Implement `event_format` filter param in `/sync` ([\#3790](#3790)) - Add synapse_admin_mau:registered_reserved_users metric to expose number of real reaserved users ([\#3846](#3846)) Bugfixes -------- - Remove connection ID for replication prometheus metrics, as it creates a large number of new series. ([\#3788](#3788)) - guest users should not be part of mau total ([\#3800](#3800)) - Bump dependency on pyopenssl 16.x, to avoid incompatibility with recent Twisted. ([\#3804](#3804)) - Fix existing room tags not coming down sync when joining a room ([\#3810](#3810)) - Fix jwt import check ([\#3824](#3824)) - fix VOIP crashes under Python 3 (#3821) ([\#3835](#3835)) - Fix manhole so that it works with latest openssh clients ([\#3841](#3841)) - Fix outbound requests occasionally wedging, which can result in federation breaking between servers. ([\#3845](#3845)) - Show heroes if room name/canonical alias has been deleted ([\#3851](#3851)) - Fix handling of redacted events from federation ([\#3859](#3859)) - ([\#3874](#3874)) - Mitigate outbound federation randomly becoming wedged ([\#3875](#3875)) Internal Changes ---------------- - CircleCI tests now run on the potential merge of a PR. ([\#3704](#3704)) - http/ is now ported to Python 3. ([\#3771](#3771)) - Improve human readable error messages for threepid registration/account update ([\#3789](#3789)) - Make /sync slightly faster by avoiding needless copies ([\#3795](#3795)) - handlers/ is now ported to Python 3. ([\#3803](#3803)) - Limit the number of PDUs/EDUs per federation transaction ([\#3805](#3805)) - Only start postgres instance for postgres tests on Travis CI ([\#3806](#3806)) - tests/ is now ported to Python 3. ([\#3808](#3808)) - crypto/ is now ported to Python 3. ([\#3822](#3822)) - rest/ is now ported to Python 3. ([\#3823](#3823)) - add some logging for the keyring queue ([\#3826](#3826)) - speed up lazy loading by 2-3x ([\#3827](#3827)) - Improved Dockerfile to remove build requirements after building reducing the image size. ([\#3834](#3834)) - Disable lazy loading for incremental syncs for now ([\#3840](#3840)) - federation/ is now ported to Python 3. ([\#3847](#3847)) - Log when we retry outbound requests ([\#3853](#3853)) - Removed some excess logging messages. ([\#3855](#3855)) - Speed up purge history for rooms that have been previously purged ([\#3856](#3856)) - Refactor some HTTP timeout code. ([\#3857](#3857)) - Fix running merged builds on CircleCI ([\#3858](#3858)) - Fix typo in replication stream exception. ([\#3860](#3860)) - Add in flight real time metrics for Measure blocks ([\#3871](#3871)) - Disable buffering and automatic retrying in treq requests to prevent timeouts. ([\#3872](#3872)) - mention jemalloc in the README ([\#3877](#3877)) - Remove unmaintained "nuke-room-from-db.sh" script ([\#3888](#3888))
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.