Fix override_settings compat#5668
Merged
carltongibson merged 2 commits intoencode:masterfrom Dec 14, 2017
Merged
Conversation
Collaborator
Author
|
@rpkilby If you have a moment, can I ask you to look at this quickly? There's just a small query over the Travis build for the first commit. It correctly fails, but only for the Python 2 builds. It should have failed for all except lint, readme, docs. Running As such, I'm happy, but I'm just "What happened to Travis?". I'm going to merge this as is, since I want to finish #5658. I don't think there is a problem; if there is we can come back to it; I'd be grateful though if you could double check. Ta. 🙂 |
2 tasks
pchiquet
pushed a commit
to pchiquet/django-rest-framework
that referenced
this pull request
Nov 17, 2020
* Add test checking override_settings compat * Refresh APISettings, rather than replace Fix suggested by @daggaz encode#2466 (comment)
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Closes #2466 Ref #5658
As per #2466, the
override_settingsintegration was updating the APISettings object correctly but was not functioning as expected since the documented usagefrom rest_framework.settings import api_settingsis bound at import time.This PR adds a (failing) test checking compat and adjusts the code to refresh APISettings in place, rather than replace the instance.
override_settingsthen works as expected.Fix was suggested by @daggaz — thanks for that! (PRs always welcome! 🙂)