mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-31 05:58:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

GH-123599: Deprecate duplicate pathname2url() implementation (#127380)

Browse source 
Call `urllib.request.pathname2url()` from `pathlib.Path.as_uri()`, and
deprecate the duplicate implementation in `PurePath`.

Co-authored-by: Adam Turner <9087854+AA-Turner@users.noreply.github.com>
This commit is contained in:
Barney Gale 2025-03-20 00:54:36 +00:00 • committed by GitHub
parent 6c776abb90
commit f141e8ec2a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 45 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

36
Lib/test/test_pathlib/test_pathlib.py
View file

@ -412,12 +412,18 @@ class PurePathTest(unittest.TestCase):
with self.assertRaises(TypeError):
P() < {}
def make_uri(self, path):
if isinstance(path, pathlib.Path):
return path.as_uri()
with self.assertWarns(DeprecationWarning):
return path.as_uri()
def test_as_uri_common(self):
P = self.cls
with self.assertRaises(ValueError):
P('a').as_uri()
self.make_uri(P('a'))
with self.assertRaises(ValueError):
P().as_uri()
self.make_uri(P())
def test_repr_roundtrips(self):
for pathstr in ('a', 'a/b', 'a/b/c', '/', '/a/b', '/a/b/c'):
@ -645,9 +651,9 @@ class PurePathTest(unittest.TestCase):
@needs_posix
def test_as_uri_posix(self):
P = self.cls
self.assertEqual(P('/').as_uri(), 'file:///')
self.assertEqual(P('/a/b.c').as_uri(), 'file:///a/b.c')
self.assertEqual(P('/a/b%#c').as_uri(), 'file:///a/b%25%23c')
self.assertEqual(self.make_uri(P('/')), 'file:///')
self.assertEqual(self.make_uri(P('/a/b.c')), 'file:///a/b.c')
self.assertEqual(self.make_uri(P('/a/b%#c')), 'file:///a/b%25%23c')
@needs_posix
def test_as_uri_non_ascii(self):
@ -657,7 +663,7 @@ class PurePathTest(unittest.TestCase):
os.fsencode('\xe9')
except UnicodeEncodeError:
self.skipTest("\\xe9 cannot be encoded to the filesystem encoding")
self.assertEqual(P('/a/b\xe9').as_uri(),
self.assertEqual(self.make_uri(P('/a/b\xe9')),
'file:///a/b' + quote_from_bytes(os.fsencode('\xe9')))
@needs_posix
@ -751,17 +757,17 @@ class PurePathTest(unittest.TestCase):
def test_as_uri_windows(self):
P = self.cls
with self.assertRaises(ValueError):
P('/a/b').as_uri()
self.make_uri(P('/a/b'))
with self.assertRaises(ValueError):
P('c:a/b').as_uri()
self.assertEqual(P('c:/').as_uri(), 'file:///c:/')
self.assertEqual(P('c:/a/b.c').as_uri(), 'file:///c:/a/b.c')
self.assertEqual(P('c:/a/b%#c').as_uri(), 'file:///c:/a/b%25%23c')
self.assertEqual(P('c:/a/b\xe9').as_uri(), 'file:///c:/a/b%C3%A9')
self.assertEqual(P('//some/share/').as_uri(), 'file://some/share/')
self.assertEqual(P('//some/share/a/b.c').as_uri(),
self.make_uri(P('c:a/b'))
self.assertEqual(self.make_uri(P('c:/')), 'file:///c:/')
self.assertEqual(self.make_uri(P('c:/a/b.c')), 'file:///c:/a/b.c')
self.assertEqual(self.make_uri(P('c:/a/b%#c')), 'file:///c:/a/b%25%23c')
self.assertEqual(self.make_uri(P('c:/a/b\xe9')), 'file:///c:/a/b%C3%A9')
self.assertEqual(self.make_uri(P('//some/share/')), 'file://some/share/')
self.assertEqual(self.make_uri(P('//some/share/a/b.c')),
'file://some/share/a/b.c')
self.assertEqual(P('//some/share/a/b%#c\xe9').as_uri(),
self.assertEqual(self.make_uri(P('//some/share/a/b%#c\xe9')),
'file://some/share/a/b%25%23c%C3%A9')
@needs_windows