Made python 2.x tests pass again.
Made python 2.x tests pass again.

samstav/bottle,SmithSamuelM/bottle,hayate/bottle,kevintaw/bottle,myzhan/bottle,wangjun/bottle,SamuelMarks/bottle,hkmshb/bottle,taisa007/bottle-ja,catroot/bottle,enzzc/bottle,ericfrederich/bottle,gaotongfei/bottle,CentricWebEstate/bottle,fkazimierczak/bottle,ListFranz/bottle,hayate/bottle,defnull/bottle,ifduyue/bottle,catroot/bottle,ifduyue/bottle,SamuelMarks/bottle,StdioA/bottle,Inndy/bottle,adampresley/bottle,Kjuly/bottle,oz123/bottle,adampresley/bottle,AWFU/bottle,khirayama/bottle,fkazimierczak/bottle,oz123/bottle,mefyl/bottle,ListFranz/bottle,mefyl/bottle,Kjuly/bottle,bottlepy/bottle,kevintaw/bottle,wangjun/bottle,samstav/bottle,prologic/bottle,xsank/bottle,mrdon/bottle,AWFU/bottle,SmithSamuelM/bottle,mrdon/bottle,myzhan/bottle,kevinmel2000/bottle,prologic/bottle,CentricWebEstate/bottle,StdioA/bottle,Inndy/bottle,enzzc/bottle,ericfrederich/bottle,bottlepy/bottle,khirayama/bottle,taisa007/bottle-ja,defnull/bottle,hkmshb/bottle,kevinmel2000/bottle,gaotongfei/bottle