@ -41,14 +41,14 @@ def merge_fragment(target, source):
def _process_versions_and_dates ( fragment , is_module , return_docs , callback ) :
def _process_versions_and_dates ( fragment , is_module , return_docs , callback ) :
def process_deprecation ( deprecation ):
def process_deprecation ( deprecation , top_level = False ):
if not isinstance ( deprecation , MutableMapping ) :
if not isinstance ( deprecation , MutableMapping ) :
return
return
if is_module and ' removed_in ' in deprecation : # used in module deprecations
if ( is_module or top_level ) and ' removed_in ' in deprecation : # used in module deprecations
callback ( deprecation , ' removed_in ' , ' removed_from_collection ' )
callback ( deprecation , ' removed_in ' , ' removed_from_collection ' )
if ' removed_at_date ' in deprecation :
if ' removed_at_date ' in deprecation :
callback ( deprecation , ' removed_at_date ' , ' removed_from_collection ' )
callback ( deprecation , ' removed_at_date ' , ' removed_from_collection ' )
if not is_module and ' version ' in deprecation : # used in plugin option deprecations
if not ( is_module or top_level ) and ' version ' in deprecation : # used in plugin option deprecations
callback ( deprecation , ' version ' , ' removed_from_collection ' )
callback ( deprecation , ' version ' , ' removed_from_collection ' )
def process_option_specifiers ( specifiers ) :
def process_option_specifiers ( specifiers ) :
@ -95,7 +95,7 @@ def _process_versions_and_dates(fragment, is_module, return_docs, callback):
if ' version_added ' in fragment :
if ' version_added ' in fragment :
callback ( fragment , ' version_added ' , ' version_added_collection ' )
callback ( fragment , ' version_added ' , ' version_added_collection ' )
if isinstance ( fragment . get ( ' deprecated ' ) , MutableMapping ) :
if isinstance ( fragment . get ( ' deprecated ' ) , MutableMapping ) :
process_deprecation ( fragment [ ' deprecated ' ] )
process_deprecation ( fragment [ ' deprecated ' ] , top_level = True )
if isinstance ( fragment . get ( ' options ' ) , MutableMapping ) :
if isinstance ( fragment . get ( ' options ' ) , MutableMapping ) :
process_options ( fragment [ ' options ' ] )
process_options ( fragment [ ' options ' ] )