[svn r37620] ensure 2.5 compatibility
[svn r37620] ensure 2.5 compatibility

--HG--
branch : trunk

eli-b/pytest,nicoddemus/pytest,ionelmc/pytest,wfxiang08/pytest,icemac/pytest,omarkohl/pytest,bukzor/pytest,ojake/pytest,omarkohl/pytest,gabrielcnr/pytest,JonathonSonesen/pytest,pytest-dev/py,txomon/pytest,doordash/pytest,oleg-alexandrov/pytest,alfredodeza/pytest,vodik/pytest,mhils/pytest,bubenkoff/pytest,Bjwebb/pytest,wfxiang08/pytest,Haibo-Wang-ORG/pytest,vmalloc/dessert,tareqalayan/pytest,MengJueM/pytest,hpk42/pytest,malinoff/pytest,vodik/pytest,hunse/pytest,tomviner/pytest,mdboom/pytest,ionelmc/pytest,MengJueM/pytest,userzimmermann/pytest,bukzor/pytest,Akasurde/pytest,jb098/pytest,jaraco/pytest,flub/pytest,gabrielcnr/pytest,oleg-alexandrov/pytest,inirudebwoy/pytest,ericdill/pytest,chillbear/pytest,mbirtwell/pytest,nicoddemus/repo-test,The-Compiler/pytest,skylarjhdownes/pytest,pfctdayelise/pytest,ropez/pytest,ghostsquad/pytest,pelme/pytest,JonathonSonesen/pytest,hpk42/pytest,hunse/pytest,tomviner/pytest,rouge8/pytest,ropez/pytest,lukas-bednar/pytest,userzimmermann/pytest,rouge8/pytest,nicoddemus/pytest,abusalimov/pytest,takluyver/pytest,etataurov/pytest,nicoddemus/repo-test,Magicjarvis/py,RonnyPfannschmidt/pytest,ojake/pytest,ghostsquad/pytest,icemac/pytest,pelme/pytest,rmfitzpatrick/pytest,abusalimov/pytest,mhils/pytest,mbirtwell/pytest,doordash/pytest,codewarrior0/pytest,bubenkoff/pytest,chiller/pytest,codewarrior0/pytest,lukas-bednar/pytest,pytest-dev/pytest,davidszotten/pytest,Bachmann1234/pytest,Carreau/pytest,Bachmann1234/pytest,ddboline/pytest,mdboom/pytest,chiller/pytest,Carreau/pytest,tgoodlet/pytest,Bjwebb/pytest,ericdill/pytest,chillbear/pytest,untitaker/pytest,takluyver/pytest,MichaelAquilina/pytest,jb098/pytest,Haibo-Wang-ORG/pytest,markshao/pytest,hackebrot/pytest,inirudebwoy/pytest,untitaker/pytest,The-Compiler/pytest