/synapse

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Already on GitHub? Sign in to your account

Unfreeze event before serializing with ujson #2483

Merged
merged 1 commit into from Oct 11, 2017

Conversation

Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
3 participants
@jeremycline @matrixbot @erikjohnston
@jeremycline
Contributor

jeremycline commented Sep 30, 2017

In newer versions of https://github.com/esnme/ultrajson, ujson does not
serialize frozendicts (introduced in esnme/ultrajson@53f85b1). Although
the PyPI version is still 1.35, Fedora ships with a build from commit
esnme/ultrajson@2f1d487. This causes the serialization to fail if the
distribution-provided package is used.

This runs the event through the unfreeze utility before serializing it.

Thanks to @ignatenkobrain for tracking down the root cause.

fixes #2351

Signed-off-by: Jeremy Cline jeremy@jcline.org
@jeremycline
Unfreeze event before serializing with ujson 
In newer versions of https://github.com/esnme/ultrajson, ujson does not
serialize frozendicts (introduced in esnme/ultrajson@53f85b1). Although
the PyPI version is still 1.35, Fedora ships with a build from commit
esnme/ultrajson@2f1d487. This causes the serialization to fail if the
distribution-provided package is used.

This runs the event through the unfreeze utility before serializing it.

Thanks to @ignatenkobrain for tracking down the root cause.

fixes #2351

Signed-off-by: Jeremy Cline <jeremy@jcline.org>
This commit was signed with a verified signature.
@jeremycline jeremycline Jeremy Cline
GPG key ID: 9223308FA9B246DB Learn about signing commits

Some checks were not successful

1 failing and 3 successful checks
@matrixbot
Sytest Dendron (Merged PR) — Build finished.
Details
@matrixbot
Sytest Postgres (Merged PR) — Build finished.
Details
@matrixbot
Sytest SQLite (Merged PR) — Build finished.
Details
continuous-integration/travis-ci/pr — The Travis CI build passed
Details
cafb8de
@matrixbot

matrixbot commented Sep 30, 2017

Can one of the admins verify this patch?
@matrixbot

matrixbot commented Sep 30, 2017

Can one of the admins verify this patch?
@matrixbot

matrixbot commented Sep 30, 2017

Can one of the admins verify this patch?
@erikjohnston
Owner

erikjohnston commented Oct 2, 2017

@matrixbot ok to test

@erikjohnston erikjohnston changed the base branch from master to develop Oct 11, 2017

@erikjohnston erikjohnston merged commit bc7f3eb into matrix-org:develop Oct 11, 2017
1 of 4 checks passed

1 of 4 checks passed

Sytest Dendron (Merged PR) Build triggered. sha1 is merged.
Details
Sytest Postgres (Merged PR) Build triggered. sha1 is merged.
Details
Sytest SQLite (Merged PR) Build started sha1 is merged.
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment