This repository has been archived by the owner on Apr 26, 2024. It is now read-only.
Fix quoting for allowed_local_3pids example config #4476
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
If you use double-quotes here, you have to escape your backslashes. It's much easier with single-quotes. (Note that the existing double-backslashes are already interpreted by python's """ parsing.)
| @@ -84,11 +84,11 @@ def default_config(self, generate_secrets=False, **kwargs): | |||
| # | |||
| # allowed_local_3pids: | |||
| # - medium: email | |||
| # pattern: ".*@matrix\\.org" | |||
| # pattern: '.*@matrix\\.org' | |||
There was a problem hiding this comment.
I'd have thought this would now have one too many escapes?
There was a problem hiding this comment.
empirically, it now works. as per the pr description: -escapes are interpreted by python """ strings, so this ends up with single-backslashes in the yaml.
There was a problem hiding this comment.
Right, but single slashes is what you want in the yaml if its going to be fed to regex?
Codecov Report
@@ Coverage Diff @@
## develop #4476 +/- ##
===========================================
+ Coverage 74.71% 74.75% +0.03%
===========================================
Files 336 336
Lines 34056 34056
Branches 5538 5538
===========================================
+ Hits 25445 25458 +13
+ Misses 7037 7025 -12
+ Partials 1574 1573 -1 |
erikjohnston
approved these changes
Jan 25, 2019
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.
If you use double-quotes here, you have to escape your backslashes. It's much
easier with single-quotes.
(Note that the existing double-backslashes are already interpreted by python's
""" parsing.)