Reorganize resolvers#3816
Open
luhn wants to merge 7 commits into
Open
Conversation
Move resolver-related things into `pyramid.resolver`. Move the rest into `pyramid._path`, which is necessary to resolve circular for future changes.
Contributor
Author
|
@mmerickel would we want to mark |
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.
This PR moves
Resolversubclasses andIAssetDescriptorimplementations topyramid.resolver. The remaining contents ofpyramid.pathgets moved topyramid._path, so thatpyramid.pathcan expose the same API without a circular dependency.In a future change,
AssetResolverpassesIPackageOverridesintoPkgResourceAssetDescriptor. This means thatAssetResolvernow requiresregistry, which falls back toget_current_registry(). This results in a circular dependency:pyramid.pathnow importspyramid.threadlocalimportspyramid.registryimportspyramid.path.Ways I considered resolving this:
registrya mandatory argument forAssetResolver.registryoptional with no threadlocal fallback. (overrides just won't work)AssetResolveret al to new package and remove frompyramid.pathentirely.AssetResolveret al to new package and putAssetResolverimport at the very bottom ofpyramid.path—Almost works but importingpyramid.resolverfirst still gives circular import.AssetResolveret al to new package and usepyramid._pathto keepAssetResolverinpyramid.path.The last one (this PR) seems like the only feasible solution, even though
_path.pyis a bit icky.