Fix bug discovered due to the change in ``implicit-str-concat``#12378

Pierre-Sassoulas wants to merge 5 commits intopytest-dev:mainpytest-dev/pytest:mainfrom

Pierre-Sassoulas:fix-implicit-str-concat-and-discovered-bug-due-to-itPierre-Sassoulas/pytest:fix-implicit-str-concat-and-discovered-bug-due-to-itCopy head branch name to clipboard