Move loading and combine code into their own submodules. #6321
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.
Replaces #6199
This is supposedly a "pure refactor"
Except for some rewrites of docstrings, and changes to tests where they imported some (non-public) routines which have moved
Effectively the following things happened ..
iris.LoadPolicy
has been renamedCombineOptions
-- butLoadPolicy
still exists as an alternative nameiris.__init__
and are now defined iniris.loading
(but still publicly declared in the
iris
module) :LoadPolicy
,LOAD_POLICY
,load
,load_cube
,load_cubes
andload_raw
-- though
LoadPolicy
is now "really"CombinePolicy
and the definition is actually iniris._combine
iris/__init__
toiris.loading
:_generate_cubes
,_load_collection
iris.cube
toiris.loading
(though these ones aren't public) :_CubeFilter
,_CubeFilterCollection
iris.__init__
toiris._combine
:_combine_cubes
,_combine_load_cubes
, andCombineCubes
(which before wasLoadPolicy
)