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

Implement workaround for login error. #4486

Merged
merged 1 commit into from
Jan 30, 2019

Conversation

xperimental
Copy link
Contributor

@xperimental 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 workaround-4216 branch 3 times, most recently from 553a9a0 to 3c7a4bb Compare January 27, 2019 17:40
@codecov-io
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
Copy link
Contributor Author

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
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
Copy link
Contributor Author

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

@xperimental xperimental force-pushed the workaround-4216 branch 3 times, most recently from a25cd62 to 0f263e0 Compare January 30, 2019 00:02
Signed-off-by: Robert Jacob <xperimental@solidproject.de>
@richvdh richvdh merged commit 457fbfa into matrix-org:develop Jan 30, 2019
@richvdh
Copy link
Member

richvdh commented Jan 30, 2019

Thanks!

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants