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
1dbd084f
Commit
1dbd084f
authored
Jul 11, 2019
by
Jeroen Demeyer
Committed by
Inada Naoki
Jul 12, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bpo-29548: no longer use PyEval_Call* functions (GH-14683)
parent
9b5ce62c
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
6 deletions
+14
-6
Modules/pyexpat.c
Modules/pyexpat.c
+1
-1
Modules/signalmodule.c
Modules/signalmodule.c
+1
-2
Objects/call.c
Objects/call.c
+10
-1
Python/codecs.c
Python/codecs.c
+2
-2
No files found.
Modules/pyexpat.c
View file @
1dbd084f
...
...
@@ -208,7 +208,7 @@ call_with_frame(const char *funcname, int lineno, PyObject* func, PyObject* args
{
PyObject
*
res
;
res
=
Py
Eval_CallObject
(
func
,
args
);
res
=
Py
Object_Call
(
func
,
args
,
NULL
);
if
(
res
==
NULL
)
{
_PyTraceback_Add
(
funcname
,
__FILE__
,
lineno
);
XML_StopParser
(
self
->
itself
,
XML_FALSE
);
...
...
Modules/signalmodule.c
View file @
1dbd084f
...
...
@@ -1667,8 +1667,7 @@ _PyErr_CheckSignals(void)
_Py_atomic_store_relaxed
(
&
Handlers
[
i
].
tripped
,
0
);
if
(
arglist
)
{
result
=
PyEval_CallObject
(
Handlers
[
i
].
func
,
arglist
);
result
=
PyObject_Call
(
Handlers
[
i
].
func
,
arglist
,
NULL
);
Py_DECREF
(
arglist
);
}
if
(
!
result
)
{
...
...
Objects/call.c
View file @
1dbd084f
...
...
@@ -457,7 +457,16 @@ PyEval_CallObjectWithKeywords(PyObject *callable,
PyObject
*
PyObject_CallObject
(
PyObject
*
callable
,
PyObject
*
args
)
{
return
PyEval_CallObjectWithKeywords
(
callable
,
args
,
NULL
);
assert
(
!
PyErr_Occurred
());
if
(
args
==
NULL
)
{
return
_PyObject_CallNoArg
(
callable
);
}
if
(
!
PyTuple_Check
(
args
))
{
PyErr_SetString
(
PyExc_TypeError
,
"argument list must be a tuple"
);
return
NULL
;
}
return
PyObject_Call
(
callable
,
args
,
NULL
);
}
...
...
Python/codecs.c
View file @
1dbd084f
...
...
@@ -416,7 +416,7 @@ _PyCodec_EncodeInternal(PyObject *object,
if
(
args
==
NULL
)
goto
onError
;
result
=
Py
Eval_CallObject
(
encoder
,
args
);
result
=
Py
Object_Call
(
encoder
,
args
,
NULL
);
if
(
result
==
NULL
)
{
wrap_codec_error
(
"encoding"
,
encoding
);
goto
onError
;
...
...
@@ -462,7 +462,7 @@ _PyCodec_DecodeInternal(PyObject *object,
if
(
args
==
NULL
)
goto
onError
;
result
=
Py
Eval_CallObject
(
decoder
,
args
);
result
=
Py
Object_Call
(
decoder
,
args
,
NULL
);
if
(
result
==
NULL
)
{
wrap_codec_error
(
"decoding"
,
encoding
);
goto
onError
;
...
...
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