FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

gh-156713: Use the filesystem encoding in nturl2path by serhiy-storchaka · Pull Request #156717 · python/cpython · GitHub

Repository navigation

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension .py  (2) .rst  (1) All 2 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
14 changes: 11 additions & 3 deletions Lib/nturl2path.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,10 @@ def url2pathname(url):
# ///C:/foo/bar/spam.foo
# become
# C:\foo\bar\spam.foo
import sys
import urllib.parse
encoding = sys.getfilesystemencoding()
errors = sys.getfilesystemencodeerrors()
if url[:3] == '///':
# URL has an empty authority section, so the path begins on the third
# character.
Expand All @@ -40,7 +43,8 @@ def url2pathname(url):
if url[1:2] == '|':
# Older URLs use a pipe after a drive letter
url = url[:1] + ':' + url[2:]
return urllib.parse.unquote(url.replace('/', '\\'))
return urllib.parse.unquote(url.replace('/', '\\'),
encoding=encoding, errors=errors)

def pathname2url(p):
"""OS-specific conversion from a file system path to a relative URL
Expand All @@ -50,7 +54,10 @@ def pathname2url(p):
# becomes
# ///C:/foo/bar/spam.foo
import ntpath
import sys
import urllib.parse
encoding = sys.getfilesystemencoding()
errors = sys.getfilesystemencodeerrors()
# First, clean up some special forms. We are going to sacrifice
# the additional information anyway
p = p.replace('\\', '/')
Expand All @@ -65,10 +72,11 @@ def pathname2url(p):
# an authority section with a zero-length authority, and a path
# section starting with a single slash.
drive = f'///{drive}'
drive = urllib.parse.quote(drive, safe='/:')
drive = urllib.parse.quote(drive, encoding=encoding, errors=errors,
safe='/:')
elif root:
# Add explicitly empty authority to path beginning with one slash.
root = f'//{root}'

tail = urllib.parse.quote(tail)
tail = urllib.parse.quote(tail, encoding=encoding, errors=errors)
return drive + root + tail
21 changes: 21 additions & 0 deletions Lib/test/test_nturl2path.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
import sys
import unittest
import urllib.parse

from test.support import warnings_helper

Expand Down Expand Up @@ -58,6 +60,15 @@ def test_pathname2url(self):
for url in urls:
self.assertEqual(fn(nturl2path.url2pathname(url)), url)

def test_pathname2url_surrogates(self):
# gh-156713: the filesystem encoding and error handler are used,
# so that paths containing surrogate characters can be converted.
encoding = sys.getfilesystemencoding()
errors = sys.getfilesystemencodeerrors()
tail = urllib.parse.quote('a\udcff', encoding=encoding, errors=errors)
self.assertEqual(nturl2path.pathname2url('C:\\a\udcff'),
'///C:/' + tail)

def test_url2pathname(self):
fn = nturl2path.url2pathname
self.assertEqual(fn('/'), '\\')
Expand Down Expand Up @@ -103,5 +114,15 @@ def test_url2pathname(self):
self.assertEqual(fn(nturl2path.pathname2url(path)), path)


def test_url2pathname_surrogates(self):
# gh-156713: the filesystem encoding and error handler are used, so
# that URLs containing percent-encoded surrogates can be converted.
encoding = sys.getfilesystemencoding()
errors = sys.getfilesystemencodeerrors()
url = urllib.parse.quote('a\udcff', encoding=encoding, errors=errors)
self.assertEqual(nturl2path.url2pathname('///C:/' + url),
'C:\\a\udcff')


if __name__ == '__main__':
unittest.main()
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Fix :func:`!nturl2path.pathname2url` and :func:`!nturl2path.url2pathname`:
the filesystem encoding and error handler are now used for percent-encoding
and decoding, as in :mod:`urllib.request`. Previously paths containing
surrogate characters raised :exc:`UnicodeEncodeError`.
Loading

Back | FazBrowse Home | New Git URL