Upgrade None assignment SyntaxWarning to a SyntaxError.

rhettinger · rhettinger · commit 11a70c79b90d · 2004-07-17T21:46:25.000Z
diff --git a/Lib/test/test_compile.py b/Lib/test/test_compile.py
@@ -138,6 +138,21 @@ def test_sequence_unpacking_error(self):
         self.assertEqual(i, 1)
         self.assertEqual(j, -1)
 
+    def test_none_assignment(self):
+        stmts = [
+            'None = 0',
+            'None += 0',
+            '__builtins__.None = 0',
+            'def None(): pass',
+            'class None: pass',
+            '(a, None) = 0, 0',
+            'for None in range(10): pass',
+            'def f(None): pass',
+        ]
+        for stmt in stmts:
+            stmt += "\n"
+            self.assertRaises(SyntaxError, compile, stmt, 'tmp', 'single')
+            self.assertRaises(SyntaxError, compile, stmt, 'tmp', 'exec')
 
 def test_main():
     test_support.run_unittest(TestSpecifics)
diff --git a/Python/compile.c b/Python/compile.c
@@ -1227,10 +1227,8 @@ none_assignment_check(struct compiling *c, char *name, int assigning)
 			msg = "assignment to None";
 		else
 			msg = "deleting None";
-		if (issue_warning(msg, c->c_filename, c->c_lineno) < 0) {
-			c->c_errors++;
-			return -1;
-		}
+		com_error(c, PyExc_SyntaxError, msg);
+		return -1;
 	}
 	return 0;
 }
@@ -1247,7 +1245,6 @@ com_addop_varname(struct compiling *c, int kind, char *name)
 	if (kind != VAR_LOAD &&
 	    none_assignment_check(c, name, kind == VAR_STORE))
 	{
-		c->c_errors++;
 		i = 255;
 		goto done;
 	}
@@ -5483,8 +5480,10 @@ symtable_add_def(struct symtable *st, char *name, int flag)
 	if ((flag & DEF_PARAM) && !(flag & DEF_INTUPLE) &&
 	    *name == 'N' && strcmp(name, "None") == 0)
 	{
-		if (symtable_warn(st, "argument named None"))
-			return -1;
+		PyErr_SetString(PyExc_SyntaxError, 
+			"Invalid syntax.  Assignment to None.");
+		symtable_error(st, 0);
+		return  -1;
 	}
 	if (_Py_Mangle(st->st_private, name, buffer, sizeof(buffer)))
 		name = buffer;

Original file line number	Diff line number	Diff line change
`@@ -1227,10 +1227,8 @@ none_assignment_check(struct compiling c, char name, int assigning)`
`1227`	`1227`	`msg = "assignment to None";`
`1228`	`1228`	`else`
`1229`	`1229`	`msg = "deleting None";`
`1230`		`- if (issue_warning(msg, c->c_filename, c->c_lineno) < 0) {`
`1231`		`- c->c_errors++;`
`1232`		`- return -1;`
`1233`		`- }`
	`1230`	`+ com_error(c, PyExc_SyntaxError, msg);`
	`1231`	`+ return -1;`
`1234`	`1232`	`}`
`1235`	`1233`	`return 0;`
`1236`	`1234`	`}`
`@@ -1247,7 +1245,6 @@ com_addop_varname(struct compiling c, int kind, char name)`
`1247`	`1245`	`if (kind != VAR_LOAD &&`
`1248`	`1246`	`none_assignment_check(c, name, kind == VAR_STORE))`
`1249`	`1247`	`{`
`1250`		`- c->c_errors++;`
`1251`	`1248`	`i = 255;`
`1252`	`1249`	`goto done;`
`1253`	`1250`	`}`
`@@ -5483,8 +5480,10 @@ symtable_add_def(struct symtable st, char name, int flag)`
`5483`	`5480`	`if ((flag & DEF_PARAM) && !(flag & DEF_INTUPLE) &&`
`5484`	`5481`	`*name == 'N' && strcmp(name, "None") == 0)`
`5485`	`5482`	`{`
`5486`		`- if (symtable_warn(st, "argument named None"))`
`5487`		`- return -1;`
	`5483`	`+ PyErr_SetString(PyExc_SyntaxError,`
	`5484`	`+ "Invalid syntax. Assignment to None.");`
	`5485`	`+ symtable_error(st, 0);`
	`5486`	`+ return -1;`
`5488`	`5487`	`}`
`5489`	`5488`	`if (_Py_Mangle(st->st_private, name, buffer, sizeof(buffer)))`
`5490`	`5489`	`name = buffer;`