Skip to content

Commit 0d05714

Browse files
author
Kazuki Suzuki Przyborowski
committed
Update pyfoxfile.py
1 parent 4fc57f7 commit 0d05714

1 file changed

Lines changed: 11 additions & 11 deletions

File tree

pyfoxfile.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
import platform
4141
from io import StringIO, BytesIO
4242
from collections import namedtuple
43-
import posixpath as pp # POSIX-safe joins/normpaths
43+
import posixpath # POSIX-safe joins/normpaths
4444
try:
4545
from backports import tempfile
4646
except ImportError:
@@ -49,13 +49,13 @@
4949
try:
5050
from http.server import BaseHTTPRequestHandler, HTTPServer
5151
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
5454
except ImportError:
5555
from BaseHTTPServer import BaseHTTPRequestHandler, HTTPServer
5656
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
5959

6060
# FTP Support
6161
ftpssl = True
@@ -978,8 +978,8 @@ def _resolves_outside(parent, target):
978978

979979
import posixpath as pp
980980
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 '/'
983983

984984
# ensure trailing slash on base for the prefix test
985985
base_slash = base if base.endswith(u"/") else (base + u"/")
@@ -1521,8 +1521,8 @@ def _discover_len_and_reset(fobj):
15211521
# URL parser for HTTP/HTTPS
15221522
# =========================
15231523
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 "")
15261526

15271527
scheme = (parts.scheme or "").lower()
15281528
if scheme not in ("http", "https"):
@@ -1570,7 +1570,7 @@ def _basic_ok(auth_header, expect_user, expect_pass):
15701570
return False
15711571
try:
15721572
b64 = auth_header.strip().split(" ", 1)[1]
1573-
raw = _b64.b64decode(_to_bytes(b64))
1573+
raw = base64.b64decode(_to_bytes(b64))
15741574
# raw may be bytes like b"user:pass"
15751575
try:
15761576
raw_txt = raw.decode("utf-8")
@@ -14166,7 +14166,7 @@ def _ok_headers(self, length_known):
1416614166
self.end_headers()
1416714167

1416814168
def _path_only(self):
14169-
p = _urlparse(self.path or "/")
14169+
p = urlparse(self.path or "/")
1417014170
try:
1417114171
from urllib.parse import unquote
1417214172
except ImportError:

0 commit comments

Comments
 (0)