Apply workaround for multiple short options for Python <= 3.8#5526

nicoddemus merged 2 commits intopytest-dev:masterpytest-dev/pytest:masterfrom

nicoddemus:cmdline-shortoptnicoddemus/pytest:cmdline-shortoptCopy head branch name to clipboard