Move unquote_plus import to compat.py