[marmaduke]

That seems reasonable, and it’s what Django does as well I think. The change list doesn’t mention it hence my comment.

I’m not surprised that deprecation logic is harder than the new features.