|
40 | 40 | import platform |
41 | 41 | from io import StringIO, BytesIO |
42 | 42 | from collections import namedtuple |
43 | | -import posixpath as pp # POSIX-safe joins/normpaths |
| 43 | +import posixpath # POSIX-safe joins/normpaths |
44 | 44 | try: |
45 | 45 | from backports import tempfile |
46 | 46 | except ImportError: |
|
49 | 49 | try: |
50 | 50 | from http.server import BaseHTTPRequestHandler, HTTPServer |
51 | 51 | from socketserver import TCPServer |
52 | | - from urllib.parse import urlparse as _urlparse, parse_qs as _parse_qs |
53 | | - import base64 as _b64 |
| 52 | + from urllib.parse import urlparse, parse_qs |
| 53 | + import base64 |
54 | 54 | except ImportError: |
55 | 55 | from BaseHTTPServer import BaseHTTPRequestHandler, HTTPServer |
56 | 56 | from SocketServer import TCPServer |
57 | | - from urlparse import urlparse as _urlparse, parse_qs as _parse_qs |
58 | | - import base64 as _b64 |
| 57 | + from urlparse import urlparse, parse_qs |
| 58 | + import base64 |
59 | 59 |
|
60 | 60 | # FTP Support |
61 | 61 | ftpssl = True |
@@ -978,8 +978,8 @@ def _resolves_outside(parent, target): |
978 | 978 |
|
979 | 979 | import posixpath as pp |
980 | 980 | root = u"/" |
981 | | - base = pp.normpath(pp.join(root, parent)) # '/dir/sub' or '/' |
982 | | - cand = pp.normpath(pp.join(base, target)) # resolved target under '/' |
| 981 | + base = posixpath.normpath(posixpath.join(root, parent)) # '/dir/sub' or '/' |
| 982 | + cand = posixpath.normpath(posixpath.join(base, target)) # resolved target under '/' |
983 | 983 |
|
984 | 984 | # ensure trailing slash on base for the prefix test |
985 | 985 | base_slash = base if base.endswith(u"/") else (base + u"/") |
@@ -1521,8 +1521,8 @@ def _discover_len_and_reset(fobj): |
1521 | 1521 | # URL parser for HTTP/HTTPS |
1522 | 1522 | # ========================= |
1523 | 1523 | def _parse_http_url(url): |
1524 | | - parts = _urlparse(url) |
1525 | | - qs = _parse_qs(parts.query or "") |
| 1524 | + parts = urlparse(url) |
| 1525 | + qs = parse_qs(parts.query or "") |
1526 | 1526 |
|
1527 | 1527 | scheme = (parts.scheme or "").lower() |
1528 | 1528 | if scheme not in ("http", "https"): |
@@ -1570,7 +1570,7 @@ def _basic_ok(auth_header, expect_user, expect_pass): |
1570 | 1570 | return False |
1571 | 1571 | try: |
1572 | 1572 | b64 = auth_header.strip().split(" ", 1)[1] |
1573 | | - raw = _b64.b64decode(_to_bytes(b64)) |
| 1573 | + raw = base64.b64decode(_to_bytes(b64)) |
1574 | 1574 | # raw may be bytes like b"user:pass" |
1575 | 1575 | try: |
1576 | 1576 | raw_txt = raw.decode("utf-8") |
@@ -14166,7 +14166,7 @@ def _ok_headers(self, length_known): |
14166 | 14166 | self.end_headers() |
14167 | 14167 |
|
14168 | 14168 | def _path_only(self): |
14169 | | - p = _urlparse(self.path or "/") |
| 14169 | + p = urlparse(self.path or "/") |
14170 | 14170 | try: |
14171 | 14171 | from urllib.parse import unquote |
14172 | 14172 | except ImportError: |
|
0 commit comments