Skip to content

Commit 2d280e9

Browse files
committed
Update generated files after merging main again
Also restore a missing symbol in the base64 module that we had removed but is depended upon by the Z85 implemenation that was recently added. This makes CPython buildable again.
1 parent d5a726f commit 2d280e9

File tree

6 files changed

+406
-1
lines changed

6 files changed

+406
-1
lines changed

Include/internal/pycore_global_objects_fini_generated.h

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Include/internal/pycore_global_strings.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -440,6 +440,7 @@ struct _Py_global_strings {
440440
STRUCT_FOR_ID(flags)
441441
STRUCT_FOR_ID(flush)
442442
STRUCT_FOR_ID(fold)
443+
STRUCT_FOR_ID(fold_spaces)
443444
STRUCT_FOR_ID(follow_symlinks)
444445
STRUCT_FOR_ID(format)
445446
STRUCT_FOR_ID(from_param)
@@ -618,6 +619,7 @@ struct _Py_global_strings {
618619
STRUCT_FOR_ID(overlapped)
619620
STRUCT_FOR_ID(owner)
620621
STRUCT_FOR_ID(p)
622+
STRUCT_FOR_ID(pad)
621623
STRUCT_FOR_ID(pages)
622624
STRUCT_FOR_ID(parent)
623625
STRUCT_FOR_ID(password)
@@ -770,7 +772,9 @@ struct _Py_global_strings {
770772
STRUCT_FOR_ID(weekday)
771773
STRUCT_FOR_ID(which)
772774
STRUCT_FOR_ID(who)
775+
STRUCT_FOR_ID(width)
773776
STRUCT_FOR_ID(withdata)
777+
STRUCT_FOR_ID(wrap)
774778
STRUCT_FOR_ID(writable)
775779
STRUCT_FOR_ID(write)
776780
STRUCT_FOR_ID(write_through)

Include/internal/pycore_runtime_init_generated.h

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Include/internal/pycore_unicodeobject_generated.h

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Lib/base64.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -349,6 +349,8 @@ def b85decode(b):
349349
b = _bytes_from_decode_data(b)
350350
return binascii.a2b_base85(b, strict_mode=True)
351351

352+
_b85alphabet = (b"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"
353+
b"abcdefghijklmnopqrstuvwxyz!#$%&()*+-;<=>?@^_`{|}~")
352354
_z85alphabet = (b'0123456789abcdefghijklmnopqrstuvwxyz'
353355
b'ABCDEFGHIJKLMNOPQRSTUVWXYZ.-:+=^!/*?&<>()[]{}@%$#')
354356
# Translating b85 valid but z85 invalid chars to b'\x00' is required

0 commit comments

Comments
 (0)