Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
503d6c5a
Commit
503d6c5a
authored
Oct 24, 2010
by
Benjamin Peterson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove broken code accounting an offset the size of the line #10186
parent
8451c4b6
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
2 deletions
+9
-2
Lib/test/test_traceback.py
Lib/test/test_traceback.py
+6
-0
Misc/NEWS
Misc/NEWS
+3
-0
Python/pythonrun.c
Python/pythonrun.c
+0
-2
No files found.
Lib/test/test_traceback.py
View file @
503d6c5a
...
...
@@ -289,6 +289,12 @@ class BaseExceptionReportingTests:
self
.
assertIn
(
'inner_raise() # Marker'
,
blocks
[
2
])
self
.
check_zero_div
(
blocks
[
2
])
def
test_syntax_error_offset_at_eol
(
self
):
# See #10186.
def
e
():
raise
SyntaxError
(
''
,
(
''
,
0
,
5
,
'hello'
))
msg
=
self
.
get_report
(
e
).
splitlines
()
self
.
assertEqual
(
msg
[
-
2
],
" ^"
)
class
PyExcReportingTests
(
BaseExceptionReportingTests
,
unittest
.
TestCase
):
...
...
Misc/NEWS
View file @
503d6c5a
...
...
@@ -10,6 +10,9 @@ What's New in Python 3.2 Beta 1?
Core and Builtins
-----------------
- Issue #10186: Fix the SyntaxError caret when the offset is equal to the length
of the offending line.
- Issue #6011: sysconfig and distutils.sysconfig use the surrogateescape error
handler to parse the Makefile file. Avoid a UnicodeDecodeError if the source
code directory name contains a non-ASCII character and the locale encoding is
...
...
Python/pythonrun.c
View file @
503d6c5a
...
...
@@ -1344,8 +1344,6 @@ print_error_text(PyObject *f, int offset, const char *text)
{
char
*
nl
;
if
(
offset
>=
0
)
{
if
(
offset
>
0
&&
offset
==
(
int
)
strlen
(
text
))
offset
--
;
for
(;;)
{
nl
=
strchr
(
text
,
'\n'
);
if
(
nl
==
NULL
||
nl
-
text
>=
offset
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment