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

diff --git a/Lib/test/test_compile.py b/Lib/test/test_compile.py
index 4e15d8c65765af2f9ce9bf4674e1f2aa870cb98f..6ffd64ab576715c4c2083efcff19c31ddc188f58 100644 (file)
--- a/Lib/test/test_compile.py
+++ b/Lib/test/test_compile.py
@@ -281,6 +281,8 @@ if 1:
             self.assertRaises(SyntaxError, compile, stmt, 'tmp', 'exec')
         # This is ok.
         compile("from None import x", "tmp", "exec")
+        compile("from x import None as y", "tmp", "exec")
+        compile("import None as x", "tmp", "exec")
 
     def test_import(self):
         succeed = [

diff --git a/Python/ast.c b/Python/ast.c
index 9639350bc7f7b2513c84bfbb0db3168eb0158c72..d25925944aeadbcf1e601b6afd2de7965c4ad4e0 100644 (file)
--- a/Python/ast.c
+++ b/Python/ast.c
@@ -2316,8 +2316,10 @@ alias_for_import_name(struct compiling *c, const node *n, int store)
                 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 @@ alias_for_import_name(struct compiling *c, const node *n, int store)
             }
             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)