Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 5167e27

Browse filesBrowse files
Drop the replace arg to _extensions_cache_set().
1 parent 062c66c commit 5167e27
Copy full SHA for 5167e27

File tree

Expand file treeCollapse file tree

1 file changed

+5
-9
lines changed
Filter options
Expand file treeCollapse file tree

1 file changed

+5
-9
lines changed

‎Python/import.c

Copy file name to clipboardExpand all lines: Python/import.c
+5-9Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1047,8 +1047,7 @@ _extensions_cache_get(PyObject *filename, PyObject *name)
10471047
}
10481048

10491049
static int
1050-
_extensions_cache_set(PyObject *filename, PyObject *name, PyModuleDef *def,
1051-
bool replace)
1050+
_extensions_cache_set(PyObject *filename, PyObject *name, PyModuleDef *def)
10521051
{
10531052
int res = -1;
10541053
assert(def != NULL);
@@ -1077,15 +1076,12 @@ _extensions_cache_set(PyObject *filename, PyObject *name, PyModuleDef *def,
10771076
/* It was previously deleted. */
10781077
entry->value = def;
10791078
}
1080-
/* We expect it to be static, so it must be the same pointer. */
1081-
else if ((PyModuleDef *)entry->value == def) {
1079+
else {
1080+
/* We expect it to be static, so it must be the same pointer. */
1081+
assert((PyModuleDef *)entry->value == def);
10821082
/* It was already added. */
10831083
already_set = 1;
10841084
}
1085-
else {
1086-
assert(replace);
1087-
entry->value = def;
1088-
}
10891085

10901086
if (!already_set) {
10911087
/* We assume that all module defs are statically allocated
@@ -1345,7 +1341,7 @@ update_global_state_for_extension(PyThreadState *tstate,
13451341
PyModuleDef *cached = _extensions_cache_get(path, name);
13461342
assert(cached == NULL || cached == def);
13471343
#endif
1348-
if (_extensions_cache_set(path, name, def, false) < 0) {
1344+
if (_extensions_cache_set(path, name, def) < 0) {
13491345
return -1;
13501346
}
13511347
}

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.