Staging
v0.8.1
https://github.com/python/cpython
Revision 15bc9ab301d73f20bff47a12ef05326feb40f797 authored by Guido van Rossum on 15 May 2020, 02:22:48 UTC, committed by GitHub on 15 May 2020, 02:22:48 UTC


This fixes both the traceback.py module and the C code for formatting syntax errors (in Python/pythonrun.c). They now both consistently do the following:

- Suppress caret if it points left of text
- Allow caret pointing just past end of line
- If caret points past end of line, clip to *just* past end of line

The syntax error formatting code in traceback.py was mostly rewritten; small, subtle changes were applied to the C code in pythonrun.c.

There's still a difference when the text contains embedded newlines. Neither handles these very well, and I don't think the case occurs in practice.

Automerge-Triggered-By: @gvanrossum
1 parent 1aa8767
History
Tip revision: 15bc9ab301d73f20bff47a12ef05326feb40f797 authored by Guido van Rossum on 15 May 2020, 02:22:48 UTC
bpo-40612: Fix SyntaxError edge cases in traceback formatting (GH-20072)
Tip revision: 15bc9ab
File Mode Size
bdist_wininst
clinic
icons
layout
WinMain.c -rw-r--r-- 449 bytes
_msi.c -rw-r--r-- 32.6 KB
_testconsole.c -rw-r--r-- 3.2 KB
classicAppCompat.can.xml -rw-r--r-- 3.9 KB
classicAppCompat.cat -rw-r--r-- 10.7 KB
classicAppCompat.sccd -rw-r--r-- 18.1 KB
config.c -rw-r--r-- 5.5 KB
crtlicense.txt -rw-r--r-- 1.7 KB
dl_nt.c -rw-r--r-- 1.3 KB
empty.c -rw-r--r-- 137 bytes
errmap.h -rw-r--r-- 4.9 KB
errmap.mak -rw-r--r-- 95 bytes
frozen_dllmain.c -rw-r--r-- 3.9 KB
getpathp.c -rw-r--r-- 34.0 KB
invalid_parameter_handler.c -rw-r--r-- 549 bytes
launcher.c -rw-r--r-- 63.7 KB
msvcrtmodule.c -rw-r--r-- 15.6 KB
pyconfig.h -rw-r--r-- 19.8 KB
pylauncher.rc -rw-r--r-- 1.5 KB
pyshellext.cpp -rw-r--r-- 18.3 KB
pyshellext.def -rw-r--r-- 141 bytes
pyshellext.idl -rw-r--r-- 277 bytes
pyshellext.rc -rw-r--r-- 1.1 KB
pyshellext_d.def -rw-r--r-- 143 bytes
python.manifest -rw-r--r-- 1.3 KB
python3.def -rw-r--r-- 40.6 KB
python3dll.c -rw-r--r-- 134 bytes
python_exe.rc -rw-r--r-- 1.2 KB
python_nt.rc -rw-r--r-- 1.2 KB
python_uwp.cpp -rw-r--r-- 6.5 KB
python_ver_rc.h -rw-r--r-- 970 bytes
pythonw_exe.rc -rw-r--r-- 1.2 KB
readme.txt -rw-r--r-- 3.5 KB
sqlite3.rc -rw-r--r-- 1.3 KB
store_info.txt -rw-r--r-- 6.2 KB
testpy.py -rw-r--r-- 831 bytes
validate_ucrtbase.py -rw-r--r-- 2.7 KB
winreg.c -rw-r--r-- 63.6 KB
winsound.c -rw-r--r-- 6.5 KB

readme.txt

back to top