[Python-checkins] cpython: Issue #27911: Remove some unnecessary error checks in import.c.
brett.cannon
python-checkins at python.org
Wed Sep 7 20:01:10 EDT 2016
https://hg.python.org/cpython/rev/96c6816825dc
changeset: 103264:96c6816825dc
user: Brett Cannon <brett at python.org>
date: Wed Sep 07 17:00:43 2016 -0700
summary:
Issue #27911: Remove some unnecessary error checks in import.c.
Thanks to Xiang Zhang for the patch.
files:
Misc/NEWS | 3 +++
Python/import.c | 8 ++------
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@
Core and Builtins
-----------------
+- Issue #27911: Remove unnecessary error checks in
+ import.c:exec_builtin_or_dynamic().
+
- Issue #27983: Cause lack of llvm-profdata tool when using clang as
required for PGO linking to be a configure time error rather than
make time when --with-optimizations is enabled. Also improve our
diff --git a/Python/import.c b/Python/import.c
--- a/Python/import.c
+++ b/Python/import.c
@@ -1942,19 +1942,15 @@
def = PyModule_GetDef(mod);
if (def == NULL) {
- if (PyErr_Occurred()) {
- return -1;
- }
return 0;
}
+
state = PyModule_GetState(mod);
- if (PyErr_Occurred()) {
- return -1;
- }
if (state) {
/* Already initialized; skip reload */
return 0;
}
+
return PyModule_ExecDef(mod, def);
}
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list