tmp

Author: lucywang000

w3lib/http.py

@@ -1,6 +1,7 @@
 from base64 import urlsafe_b64encode
 from typing import Any, List, MutableMapping, Optional, AnyStr, Sequence, Union, Mapping
-from w3lib.util import to_bytes
+from w3lib.encoding import to_unicode
+from w3lib.util import to_bytes, to_native_str
 
 HeadersDictInput = Mapping[bytes, Union[Any, Sequence]]
 HeadersDictOutput = MutableMapping[bytes, List[bytes]]
@@ -95,7 +96,7 @@ def basic_auth_header(username: AnyStr, password: AnyStr, encoding: str = 'ISO-8
 
     """
 
-    auth = "%r:%r" % (username, password)
+    auth = "%s:%s" % (to_native_str(username), to_native_str(password))
     # XXX: RFC 2617 doesn't define encoding, but ISO-8859-1
     # seems to be the most widely used encoding here. See also:
     # http://greenbytes.de/tech/webdav/draft-ietf-httpauth-basicauth-enc-latest.html

w3lib/url.py

@@ -411,11 +411,11 @@ def parse_data_uri(uri: StrOrBytes) -> _ParseDataURIResult:
 ]
 
 
-def _safe_ParseResult(parts, encoding='utf8', path_encoding='utf8'):
+def _safe_ParseResult(parts: ParseResult, encoding: str  = 'utf8', path_encoding: str = 'utf8') -> Tuple[str, str, str, str, str, str]:
     # IDNA encoding can fail for too long labels (>63 characters)
     # or missing labels (e.g. http://.example.com)
     try:
-        netloc = parts.netloc.encode('idna').decode()
+        netloc: StrOrBytes = parts.netloc.encode('idna')
     except UnicodeError:
         netloc = parts.netloc
 
@@ -531,7 +531,7 @@ def _unquotepath(path):
     return unquote_to_bytes(path)
 
 
-def parse_url(url, encoding=None):
+def parse_url(url: Union[StrOrBytes, ParseResult], encoding=None):
     """Return urlparsed url from the given argument (which could be an already
     parsed url)
     """