Mercurial > cpython-lru_cache-weakref

diff Python/import.c @ 61773:62c0e5f14138 legacy-trunk

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Turned out that if you used explicit relative import syntax (e.g. from .os import sep) and it failed, import would still try the implicit relative import semantics of an absolute import (from os import sep). That's not right, so when level is negative, only do explicit relative import semantics. Fixes issue #7902. Thanks to Meador Inge for the patch.
author Brett Cannon <bcannon@gmail.com>
date Thu, 20 May 2010 18:37:55 +0000
parents fd25030223b0
children b36cb4602e21
line wrap: on
line diff
--- a/Python/import.c	Thu May 20 11:29:45 2010 +0000
+++ b/Python/import.c	Thu May 20 18:37:55 2010 +0000
@@ -2134,7 +2134,8 @@
     if (parent == NULL)
         return NULL;
 
-    head = load_next(parent, Py_None, &name, buf, &buflen);
+    head = load_next(parent, level < 0 ? Py_None : parent, &name, buf,
+                        &buflen);
     if (head == NULL)
         return NULL;