Fix internal import errors

Next commit will introduce six - I'm not pissing about with urllib2

[skip ci]