Fix thread[ing] imports for py2 and py3.