diff options
| author | Raymond Hettinger <python@rcn.com> | 2012-04-23 00:22:48 -0700 |
|---|---|---|
| committer | Raymond Hettinger <python@rcn.com> | 2012-04-23 00:22:48 -0700 |
| commit | 016878aea6fb1904b8a04c7f56223c90cd8a0522 (patch) | |
| tree | 9a26efef0ab8adaf26e07774f5332401ccef658f /Python | |
| parent | 094c33f0472a3f9c0aed621a736d24760a5c4d60 (diff) | |
| parent | ea17082c25a4835975537373454097b8dd054692 (diff) | |
| download | cpython-git-016878aea6fb1904b8a04c7f56223c90cd8a0522.tar.gz | |
merge
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/import.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Python/import.c b/Python/import.c index 4d8a610c3d..108a1e1b07 100644 --- a/Python/import.c +++ b/Python/import.c @@ -1267,7 +1267,8 @@ find_module(char *fullname, char *subname, PyObject *path, char *buf, } name = PyMem_MALLOC(MAXPATHLEN+1); if (name == NULL) { - return PyErr_NoMemory(); + PyErr_NoMemory(); + return NULL; } strcpy(name, subname); |