Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit90c892e

Browse files
gh-85110: Preserve relative path in URL without netloc in urllib.parse.urlunsplit() (GH-123179)
1 parent9dbd123 commit90c892e

File tree

3 files changed

+38
-9
lines changed

3 files changed

+38
-9
lines changed

‎Lib/test/test_urlparse.py‎

Lines changed: 30 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,9 @@ def test_roundtrips(self):
207207
('scheme://///path/to/file',
208208
('scheme','','///path/to/file','','',''),
209209
('scheme','','///path/to/file','','')),
210+
('file:tmp/junk.txt',
211+
('file','','tmp/junk.txt','','',''),
212+
('file','','tmp/junk.txt','','')),
210213
('file:///tmp/junk.txt',
211214
('file','','/tmp/junk.txt','','',''),
212215
('file','','/tmp/junk.txt','','')),
@@ -216,6 +219,18 @@ def test_roundtrips(self):
216219
('file://///tmp/junk.txt',
217220
('file','','///tmp/junk.txt','','',''),
218221
('file','','///tmp/junk.txt','','')),
222+
('http:tmp/junk.txt',
223+
('http','','tmp/junk.txt','','',''),
224+
('http','','tmp/junk.txt','','')),
225+
('http://example.com/tmp/junk.txt',
226+
('http','example.com','/tmp/junk.txt','','',''),
227+
('http','example.com','/tmp/junk.txt','','')),
228+
('http:///example.com/tmp/junk.txt',
229+
('http','','/example.com/tmp/junk.txt','','',''),
230+
('http','','/example.com/tmp/junk.txt','','')),
231+
('http:////example.com/tmp/junk.txt',
232+
('http','','//example.com/tmp/junk.txt','','',''),
233+
('http','','//example.com/tmp/junk.txt','','')),
219234
('imap://mail.python.org/mbox1',
220235
('imap','mail.python.org','/mbox1','','',''),
221236
('imap','mail.python.org','/mbox1','','')),
@@ -260,7 +275,8 @@ def _encode(t):
260275
('','','schème:path/to/file','','')),
261276
]
262277
forurl,parsed,splitinstr_cases+bytes_cases:
263-
self.checkRoundtrips(url,parsed,split)
278+
withself.subTest(url):
279+
self.checkRoundtrips(url,parsed,split)
264280

265281
deftest_roundtrips_normalization(self):
266282
str_cases= [
@@ -292,7 +308,8 @@ def _encode(t):
292308
tuple(x.encode('ascii')forxint[3]))
293309
bytes_cases= [_encode(x)forxinstr_cases]
294310
forurl,url2,parsed,splitinstr_cases+bytes_cases:
295-
self.checkRoundtrips(url,parsed,split,url2)
311+
withself.subTest(url):
312+
self.checkRoundtrips(url,parsed,split,url2)
296313

297314
deftest_http_roundtrips(self):
298315
# urllib.parse.urlsplit treats 'http:' as an optimized special case,
@@ -333,11 +350,17 @@ def _encode(t):
333350
self.checkRoundtrips(url,parsed,split)
334351

335352
defcheckJoin(self,base,relurl,expected):
336-
str_components= (base,relurl,expected)
337-
self.assertEqual(urllib.parse.urljoin(base,relurl),expected)
338-
bytes_components=baseb,relurlb,expectedb= [
339-
x.encode('ascii')forxinstr_components]
340-
self.assertEqual(urllib.parse.urljoin(baseb,relurlb),expectedb)
353+
withself.subTest(base=base,relurl=relurl):
354+
self.assertEqual(urllib.parse.urljoin(base,relurl),expected)
355+
baseb=base.encode('ascii')
356+
relurlb=relurl.encode('ascii')
357+
expectedb=expected.encode('ascii')
358+
self.assertEqual(urllib.parse.urljoin(baseb,relurlb),expectedb)
359+
360+
relurl=urllib.parse.urlunsplit(urllib.parse.urlsplit(relurl))
361+
self.assertEqual(urllib.parse.urljoin(base,relurl),expected)
362+
relurlb=urllib.parse.urlunsplit(urllib.parse.urlsplit(relurlb))
363+
self.assertEqual(urllib.parse.urljoin(baseb,relurlb),expectedb)
341364

342365
deftest_unparse_parse(self):
343366
str_cases= ['Python','./Python','x-newscheme://foo.com/stuff','x://y','x:/y','x:/','/',]

‎Lib/urllib/parse.py‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -525,9 +525,13 @@ def urlunsplit(components):
525525
empty query; the RFC states that these are equivalent)."""
526526
scheme,netloc,url,query,fragment,_coerce_result= (
527527
_coerce_args(*components))
528-
ifnetlocor (schemeandschemeinuses_netloc)orurl[:2]=='//':
528+
ifnetloc:
529529
ifurlandurl[:1]!='/':url='/'+url
530-
url='//'+ (netlocor'')+url
530+
url='//'+netloc+url
531+
elifurl[:2]=='//':
532+
url='//'+url
533+
elifschemeandschemeinuses_netlocand (noturlorurl[:1]=='/'):
534+
url='//'+url
531535
ifscheme:
532536
url=scheme+':'+url
533537
ifquery:
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Preserve relative path in URL without netloc in
2+
:func:`urllib.parse.urlunsplit` and:func:`urllib.parse.urlunparse`.

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp