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.

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

Implement workaround for login error. #4486

Merged
merged 1 commit into from Jan 30, 2019

Conversation

Projects
None yet
3 participants
@xperimental
Copy link
Contributor

xperimental commented Jan 27, 2019

This contains the workaround mentioned by @cuibonobo. I have manually applied it to my Synapse instance and it seems to work.

Pull Request Checklist

  • Pull request is based on the develop branch
  • Pull request includes a changelog file
  • Pull request includes a sign off

@xperimental xperimental force-pushed the xperimental:workaround-4216 branch 3 times, most recently from 553a9a0 to 3c7a4bb Jan 27, 2019

@codecov-io

This comment has been minimized.

Copy link

codecov-io commented Jan 27, 2019

Codecov Report

Merging #4486 into develop will decrease coverage by <.01%.
The diff coverage is 100%.

@@             Coverage Diff             @@
##           develop    #4486      +/-   ##
===========================================
- Coverage    74.67%   74.67%   -0.01%     
===========================================
  Files          336      336              
  Lines        34293    34293              
  Branches      5592     5592              
===========================================
- Hits         25610    25609       -1     
- Misses        7096     7099       +3     
+ Partials      1587     1585       -2
@xperimental

This comment has been minimized.

Copy link
Contributor Author

xperimental commented Jan 27, 2019

I noticed that the linter was complaining about the length of the line. Having not done much Python before, I'd appreciate feedback on whether breaking the line with a backslash is the preferred way to achieve the result.

@richvdh

This comment has been minimized.

Copy link
Member

richvdh commented Jan 29, 2019

Having not done much Python before, I'd appreciate feedback on whether breaking the line with a backslash is the preferred way to achieve the result.

It's a subjective choice. We normally use parens here:

if (self.parent_context is not None
    and hasattr(self.parent_context, '_resource_usage')
):
    # do some stuff

or something like that.

(see also https://github.com/matrix-org/synapse/blob/master/docs/code_style.rst)

@xperimental xperimental force-pushed the xperimental:workaround-4216 branch from 3c7a4bb to d836e6a Jan 29, 2019

@xperimental

This comment has been minimized.

Copy link
Contributor Author

xperimental commented Jan 29, 2019

Thanks @richvdh . I have updated the code to reflect the other code style.

@xperimental xperimental force-pushed the xperimental:workaround-4216 branch 3 times, most recently from a25cd62 to 0f263e0 Jan 29, 2019

Implement workaround for login error.
Signed-off-by: Robert Jacob <xperimental@solidproject.de>

@xperimental xperimental force-pushed the xperimental:workaround-4216 branch from 0f263e0 to 2a7f0b8 Jan 30, 2019

@richvdh richvdh merged commit 457fbfa into matrix-org:develop Jan 30, 2019

5 checks passed

ci/circleci: sytestpy2merged Your tests passed on CircleCI!
Details
ci/circleci: sytestpy2postgresmerged Your tests passed on CircleCI!
Details
ci/circleci: sytestpy3merged Your tests passed on CircleCI!
Details
ci/circleci: sytestpy3postgresmerged Your tests passed on CircleCI!
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@richvdh

This comment has been minimized.

Copy link
Member

richvdh commented Jan 30, 2019

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment