Fix misimport#12207

flying-sheep wants to merge 2 commits intopytest-dev:mainpytest-dev/pytest:mainfrom

flying-sheep:fix-misimportflying-sheep/pytest:fix-misimportCopy head branch name to clipboard