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
5d2c6835
Commit
5d2c6835
authored
Mar 22, 2004
by
Armin Rigo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Lost reference.
parent
1eb4bfc6
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
6 deletions
+8
-6
Python/pythonrun.c
Python/pythonrun.c
+8
-6
No files found.
Python/pythonrun.c
View file @
5d2c6835
...
...
@@ -1086,8 +1086,8 @@ PyErr_PrintEx(int set_sys_last_vars)
void
PyErr_Display
(
PyObject
*
exception
,
PyObject
*
value
,
PyObject
*
tb
)
{
int
err
=
0
;
PyObject
*
v
=
value
;
PyObject
*
f
=
PySys_GetObject
(
"stderr"
);
Py_INCREF
(
value
);
if
(
f
==
NULL
)
fprintf
(
stderr
,
"lost sys.stderr
\n
"
);
else
{
...
...
@@ -1097,12 +1097,12 @@ void PyErr_Display(PyObject *exception, PyObject *value, PyObject *tb)
if
(
tb
&&
tb
!=
Py_None
)
err
=
PyTraceBack_Print
(
tb
,
f
);
if
(
err
==
0
&&
PyObject_HasAttrString
(
v
,
"print_file_and_line"
))
PyObject_HasAttrString
(
v
alue
,
"print_file_and_line"
))
{
PyObject
*
message
;
const
char
*
filename
,
*
text
;
int
lineno
,
offset
;
if
(
!
parse_syntax_error
(
v
,
&
message
,
&
filename
,
if
(
!
parse_syntax_error
(
v
alue
,
&
message
,
&
filename
,
&
lineno
,
&
offset
,
&
text
))
PyErr_Clear
();
else
{
...
...
@@ -1118,7 +1118,8 @@ void PyErr_Display(PyObject *exception, PyObject *value, PyObject *tb)
PyFile_WriteString
(
"
\n
"
,
f
);
if
(
text
!=
NULL
)
print_error_text
(
f
,
offset
,
text
);
v
=
message
;
Py_DECREF
(
value
);
value
=
message
;
/* Can't be bothered to check all those
PyFile_WriteString() calls */
if
(
PyErr_Occurred
())
...
...
@@ -1155,8 +1156,8 @@ void PyErr_Display(PyObject *exception, PyObject *value, PyObject *tb)
else
err
=
PyFile_WriteObject
(
exception
,
f
,
Py_PRINT_RAW
);
if
(
err
==
0
)
{
if
(
v
!=
NULL
&&
v
!=
Py_None
)
{
PyObject
*
s
=
PyObject_Str
(
v
);
if
(
v
alue
!=
Py_None
)
{
PyObject
*
s
=
PyObject_Str
(
v
alue
);
/* only print colon if the str() of the
object is not the empty string
*/
...
...
@@ -1173,6 +1174,7 @@ void PyErr_Display(PyObject *exception, PyObject *value, PyObject *tb)
if
(
err
==
0
)
err
=
PyFile_WriteString
(
"
\n
"
,
f
);
}
Py_DECREF
(
value
);
/* If an error happened here, don't show it.
XXX This is wrong, but too many callers rely on this behavior. */
if
(
err
!=
0
)
...
...
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