Python 3.x fix (removed NoneType import)

Same PR but with base branch set to staging.