commit d1f5a59edb56b64336f07fc88cff6cbebed12dd6
author Benjamin Peterson <benjamin@python.org> Sat Jun 13 13:06:21 2009 +0000
committer Benjamin Peterson <benjamin@python.org> Sat Jun 13 13:06:21 2009 +0000
tree 4486a70b3c41a35c4adb467c6d9a526bbe887c59
parent 565e1b6bb724af71f439ec914b34f74e5163fe3d

allow importing from a module named None if it has an 'as' clause

Python/ast.c

diff --git a/Python/ast.c b/Python/ast.c
index 9639350..d259259 100644
--- a/Python/ast.c
+++ b/Python/ast.c
@@ -2316,8 +2316,10 @@
                 if (!str)
                     return NULL;
             }
-            if (!forbidden_check(c, name_node, STR(name_node)))
-                return NULL;
+            else {
+                if (!forbidden_check(c, name_node, STR(name_node)))
+                    return NULL;
+            }
             name = NEW_IDENTIFIER(name_node);
             if (!name)
                 return NULL;
@@ -2330,11 +2332,11 @@
             }
             else {
                 node *asname_node = CHILD(n, 2);
-                alias_ty a = alias_for_import_name(c, CHILD(n, 0), store);
+                alias_ty a = alias_for_import_name(c, CHILD(n, 0), 0);
                 if (!a)
                     return NULL;
                 assert(!a->asname);
-                if (store && !forbidden_check(c, asname_node, STR(asname_node)))
+                if (!forbidden_check(c, asname_node, STR(asname_node)))
                     return NULL;
                 a->asname = NEW_IDENTIFIER(asname_node);
                 if (!a->asname)