Fix TypeError when importing pytest on Python 3.5.0 and 3.5.1#5752

asottile merged 6 commits intopytest-dev:masterpytest-dev/pytest:masterfrom

bluetech:typing-py350-fixbluetech/pytest:typing-py350-fixCopy head branch name to clipboard