Eliminating special case for python2.6