Moved all python2,3 compability code to separate module