Some cosmetic changes

Changed decision tree for py2 / py3 to simpler one, and changed the regex to work simpler.

I'm torn over this. I think that if the functionality differs between the py2 module and the real python module it should not be imported as the same.