@@ -645,39 +645,40 @@ def delete_page(
645645 param = WtSite .DeletePageParam (page = param )
646646 if comment :
647647 param .comment = comment
648- pages = []
649- print ("Getting pages to delete ..." )
650- for page in param .page :
651- if isinstance (page , str ):
652- string_in_pages = True
648+
649+ # fetch token in case we need to resolve string titles to page objects
650+ # Note: Not sure if this is still necessary
651+ if any (isinstance (page , str ) for page in param .page ):
652+ self ._site .tokens ["csrf" ] = self ._site .get_token ("csrf" )
653+
654+ def delete_single_page (page_ : Union ["WtPage" , MwPage ], comment : str ):
655+ if isinstance (page_ , str ):
653656 try :
654- page = self ._site .pages [page ]
655- pages .append (page )
657+ page_ = self ._site .pages [page_ ]
656658 except Exception as e :
657659 warn (
658- f"Page '{ page } ' could not be added to the list of "
660+ f"Page '{ page_ } ' could not be added to the list of "
659661 f"to-be-deleted pages. The following Exception occurred:\n { e } "
660662 )
661- else : # page is a WtPage object
662- pages .append (page )
663-
664- if string_in_pages :
665- self ._site .tokens ["csrf" ] = self ._site .get_token ("csrf" )
666-
667- def delete_single_page (page_ : Union ["WtPage" , MwPage ], comment : str ):
668- if isinstance (page_ , WtPage ):
669- return page_ .delete (comment = comment )
670- return page_ .delete (reason = comment )
663+ try :
664+ if isinstance (page_ , WtPage ):
665+ return page_ .delete (comment = comment )
666+ return page_ .delete (reason = comment )
667+ except Exception as e :
668+ warn (
669+ f"Page '{ page_ } ' could not be deleted. "
670+ f"The following Exception occurred:\n { e } "
671+ )
671672
672673 if param .parallel :
673674 return ut .parallelize (
674675 delete_single_page ,
675- pages ,
676+ param . page ,
676677 comment = param .comment ,
677678 flush_at_end = param .debug ,
678679 )
679680 else :
680- return [delete_single_page (page , param .comment ) for page in pages ]
681+ return [delete_single_page (page , param .comment ) for page in param . page ]
681682
682683 class CreatePagePackageParam (OswBaseModel ):
683684 """Parameter object for create_page_package method."""
0 commit comments