Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions Lib/test/test_urlparse.py
Original file line number Diff line number Diff line change
Expand Up @@ -985,6 +985,10 @@ def test_quote_from_bytes(self):
self.assertEqual(result, 'archaeological%20arcana')
result = urllib.parse.quote_from_bytes(b'')
self.assertEqual(result, '')
result = urllib.parse.quote_from_bytes(b'A'*10_000)
self.assertEqual(result, 'A'*10_000)
result = urllib.parse.quote_from_bytes(b'z\x01/ '*253_183)
self.assertEqual(result, 'z%01/%20'*253_183)

def test_unquote_to_bytes(self):
result = urllib.parse.unquote_to_bytes('abc%20def')
Expand Down
10 changes: 9 additions & 1 deletion Lib/urllib/parse.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@

from collections import namedtuple
import functools
import math
import re
import types
import warnings
Expand Down Expand Up @@ -906,7 +907,14 @@ def quote_from_bytes(bs, safe='/'):
if not bs.rstrip(_ALWAYS_SAFE_BYTES + safe):
return bs.decode()
quoter = _byte_quoter_factory(safe)
return ''.join(map(quoter, bs))
if (bs_len := len(bs)) < 200_000:
return ''.join(map(quoter, bs))
else:
# This saves memory - https://github.com/python/cpython/issues/95865
chunk_size = math.isqrt(bs_len)
chunks = [''.join(map(quoter, bs[i:i+chunk_size]))
for i in range(0, bs_len, chunk_size)]
return ''.join(chunks)

def urlencode(query, doseq=False, safe='', encoding=None, errors=None,
quote_via=quote_plus):
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Reduce :func:`urllib.parse.quote_from_bytes` memory use on large values.

Contributed by Dennis Sweeney.