feat: migrate callers off FEATURES-as-dict access#38772
Draft
feanil wants to merge 4 commits into
Draft
Conversation
1b8c4e8 to
7f5dbc2
Compare
9ffdb02 to
f9359f9
Compare
Pushed standalone first so CI surfaces the full list of caller sites before the migration commits land. FeaturesProxy.__setitem__ used stacklevel=2 and update() delegated to __setitem__, so every warning was reported at update()'s own 'self[key] = other[key]' line in this file (89) instead of the test or app code that actually mutated FEATURES. Why the helper instead of just bumping stacklevel: stacklevel is a frame count from warnings.warn upward. Bumping __setitem__'s stacklevel from 2 to 3 would fix the update()->__setitem__ path but would overshoot by one frame on direct __setitem__ calls (e.g. fp['X'] = True), reporting from the caller's caller. The two paths need different stacklevel arithmetic. Factors the emit into _warn_dict_access(stacklevel=3) so both __setitem__ and update() can call it with the same constant; each contributes exactly one intermediate frame. update() now writes to self.ns directly to avoid double-warning. No behavior change beyond the reported source location. Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
f9359f9 to
06d3986
Compare
Lets @override_settings(KEY=val) be seen through both settings.KEY
and settings.FEATURES['KEY']/.get('KEY'), so tests can migrate to
the flat setting without first updating every production reader
that still does settings.FEATURES['KEY'].
We walk only the UserSettingsHolder chain that @override_settings
pushes onto django.conf.settings._wrapped, NOT the bottom Settings
layer. Django's bottom Settings is a *snapshot* of the settings
module's globals taken at init time, so it doesn't reflect runtime
mutations of the module's globals — which is exactly what legacy
patch.dict(settings.FEATURES, ...) does via proxy.ns. Reading the
snapshot would mask those mutations and break legacy tests; walking
only the explicit override layers lets both paths coexist during
the migration.
ns kept as-is. A stateless redesign (drop ns, route everything
through django.conf.settings, set FEATURES = FeaturesProxy() in
each env file) was considered but rejected for this step because
FEATURES.copy() and __iter__ are widely used to snapshot the full
set of feature flags; without ns there is no clean source of truth
for "which keys are features". Once all callers have moved off the
dict pattern the proxy can be deleted outright (every
settings.FEATURES['X'] becomes settings.X), making the stateless
refactor unnecessary.
Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Production reads use getattr(settings, ...); tests use @override_settings(ENABLE_CREATOR_GROUP=...). Mixed-flag patches keep the other flag in patch.dict until its own migration. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
06d3986 to
3fe8774
Compare
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
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.
Stacked on top of #38771 (the easy deprecation fixes). Goal: migrate every caller off of `settings.FEATURES['X'] = …` / `patch.dict(settings.FEATURES, …)` / `settings.FEATURES.update(…)` and onto plain settings access. Per Feanil: the underlying settings already exist (FEATURES was previously flattened into the common.py settings modules), so callers can move directly to `settings.X` / `@override_settings(X=…)`.
Currently a single `temp:` commit that fixes `FeaturesProxy`'s stacklevel so the warnings actually point at the call sites instead of always reporting line 89 of the proxy itself. Once CI runs and surfaces the full list, real migration commits will follow.