Skip to content

Fix _url_tools.url_quote for Python ≥ 3.14 #605

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
markmentovai wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix _url_tools.url_quote for Python ≥ 3.14 #605

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions fs/_url_tools.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
import typing

import os.path
import platform
import re
import six
import sys

if typing.TYPE_CHECKING:
from typing import Text
Expand All @@ -27,12 +29,21 @@ def url_quote(path_snippet):
if six.PY2:
path = path.encode("utf-8")
path = six.moves.urllib.request.pathname2url(path)
path_snippet = "{}:{}".format(drive_letter, path)
path = "{}:{}".format(drive_letter, path)
else:
if six.PY2:
path_snippet = path_snippet.encode("utf-8")
path_snippet = six.moves.urllib.request.pathname2url(path_snippet)
return path_snippet
path = six.moves.urllib.request.pathname2url(path_snippet)
if sys.version_info >= (3, 14):
# For compatibility, restore the traditional behavior from before
# https://github.com/python/cpython/pull/127194. All callers prepend
# their own scheme including the '//'.
_, root, _ = os.path.splitroot(path_snippet)
if root:
assert path.startswith("//")
path = path[2:]

return path


def _has_drive_letter(path_snippet):
Expand Down