Skip to content

Update Unicode name preparation and codecs to Python 3.15 #9132

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

Merged
youknowone merged 1 commit into from
Oct 15, 2026
Merged

Update Unicode name preparation and codecs to Python 3.15 #9132

Show file tree
Hide file tree
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
5 changes: 3 additions & 2 deletions Lib/encodings/idna.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,8 @@ def encode(self, input, errors='strict'):
offset + exc.end,
exc.reason,
)
return bytes(result+trailing_dot), len(input)
result += trailing_dot
return result.take_bytes(), len(input)

def decode(self, input, errors='strict'):

Expand Down Expand Up @@ -311,7 +312,7 @@ def _buffer_encode(self, input, errors, final):

result += trailing_dot
size += len(trailing_dot)
return (bytes(result), size)
return (result.take_bytes(), size)

class IncrementalDecoder(codecs.BufferedIncrementalDecoder):
def _buffer_decode(self, input, errors, final):
Expand Down
6 changes: 3 additions & 3 deletions Lib/encodings/punycode.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ def segregate(str):
else:
extended.add(c)
extended = sorted(extended)
return bytes(base), extended
return base.take_bytes(), extended

def selective_len(str, max):
"""Return the length of str, considering only characters below max."""
Expand Down Expand Up @@ -83,7 +83,7 @@ def generate_generalized_integer(N, bias):
t = T(j, bias)
if N < t:
result.append(digits[N])
return bytes(result)
return result.take_bytes()
result.append(digits[t + ((N - t) % (36 - t))])
N = (N - t) // (36 - t)
j += 1
Expand Down Expand Up @@ -112,7 +112,7 @@ def generate_integers(baselen, deltas):
s = generate_generalized_integer(delta, bias)
result.extend(s)
bias = adapt(delta, points==0, baselen+points+1)
return bytes(result)
return result.take_bytes()

def punycode_encode(text):
base, extended = segregate(text)
Expand Down
2 changes: 1 addition & 1 deletion Lib/encodings/uu_codec.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ def uu_decode(input, errors='strict'):
break
try:
data = binascii.a2b_uu(s)
except binascii.Error as v:
except binascii.Error:
# Workaround for broken uuencoders by /Fredrik Lundh
nbytes = (((s[0]-32) & 63) * 4 + 5) // 3
data = binascii.a2b_uu(s[:nbytes])
Expand Down
Loading
Loading