Fixing more py3 stuff in wpswitch.