Commit a0d41bb
committed
Merge remote-tracking branch 'origin/main' into feature/clinic-parser-shrink
# Conflicts:
# Modules/_io/clinic/bufferedio.c.h
# Modules/_io/clinic/fileio.c.h
# Modules/_io/clinic/iobase.c.h
# Modules/_io/clinic/textio.c.h
# Modules/_io/clinic/winconsoleio.c.h307 files changed
Lines changed: 12317 additions & 6064 deletions
File tree
- .claude
- Doc
- builtins
- c-api
- data
- deprecations
- howto
- includes
- library
- tools
- whatsnew
- Grammar
- Include
- cpython
- internal
- InternalDocs
- Lib
- _pyrepl
- idlelib
- idle_test
- profiling/sampling
- test
- test_capi
- test_cext
- test_cppext
- test_ctypes
- test_free_threading
- test_future_stmt
- test_import
- test_inspect
- test_io
- test_lazy_import
- data/pkg
- test_peg_generator
- test_profiling
- test_sampling_profiler
- test_pyrepl
- test_tools
- translationdata/argparse
- Misc
- NEWS.d/next
- C_API
- Core_and_Builtins
- Documentation
- IDLE
- Library
- Tests
- Tools-Demos
- Windows
- Modules
- _ctypes
- clinic
- _io
- clinic
- _remote_debugging
- clinic
- _testinternalcapi
- _testlimitedcapi
- cjkcodecs
- clinic
- Objects
- PCbuild
- Parser
- lexer
- tokenizer
- Platforms/Apple/testbed
- iOSTestbed.xcodeproj
- iOSTestbed
- Programs
- Python
- Tools
- build
- c-analyzer/cpython
- inspection
- peg_generator/pegen
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
This file was deleted.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
384 | 384 | | |
385 | 385 | | |
386 | 386 | | |
387 | | - | |
388 | | - | |
| 387 | + | |
| 388 | + | |
| 389 | + | |
| 390 | + | |
| 391 | + | |
| 392 | + | |
| 393 | + | |
| 394 | + | |
389 | 395 | | |
390 | 396 | | |
391 | 397 | | |
| |||
417 | 423 | | |
418 | 424 | | |
419 | 425 | | |
420 | | - | |
| 426 | + | |
421 | 427 | | |
422 | 428 | | |
423 | 429 | | |
424 | | - | |
| 430 | + | |
| 431 | + | |
| 432 | + | |
| 433 | + | |
| 434 | + | |
425 | 435 | | |
426 | 436 | | |
427 | 437 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
116 | 116 | | |
117 | 117 | | |
118 | 118 | | |
119 | | - | |
120 | | - | |
| 119 | + | |
121 | 120 | | |
122 | | - | |
123 | | - | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
124 | 125 | | |
125 | | - | |
126 | | - | |
127 | | - | |
| 126 | + | |
128 | 127 | | |
129 | 128 | | |
130 | 129 | | |
| |||
247 | 246 | | |
248 | 247 | | |
249 | 248 | | |
250 | | - | |
251 | | - | |
252 | 249 | | |
253 | | - | |
| 250 | + | |
| 251 | + | |
| 252 | + | |
| 253 | + | |
254 | 254 | | |
255 | 255 | | |
256 | 256 | | |
| |||
690 | 690 | | |
691 | 691 | | |
692 | 692 | | |
693 | | - | |
694 | | - | |
695 | | - | |
696 | 693 | | |
697 | 694 | | |
698 | 695 | | |
| |||
758 | 755 | | |
759 | 756 | | |
760 | 757 | | |
| 758 | + | |
| 759 | + | |
761 | 760 | | |
762 | 761 | | |
763 | 762 | | |
| |||
788 | 787 | | |
789 | 788 | | |
790 | 789 | | |
| 790 | + | |
| 791 | + | |
| 792 | + | |
| 793 | + | |
| 794 | + | |
791 | 795 | | |
792 | 796 | | |
793 | 797 | | |
| |||
803 | 807 | | |
804 | 808 | | |
805 | 809 | | |
| 810 | + | |
| 811 | + | |
| 812 | + | |
| 813 | + | |
| 814 | + | |
806 | 815 | | |
807 | 816 | | |
808 | 817 | | |
| |||
0 commit comments