Fix py2 failure in unquote_str