Fix regression introduced way back in the AST code

Author: nanjekyejoannah

Lib/test/test_ast.py

@@ -494,8 +494,12 @@ def test_literal_eval_issue4907(self):
 
 
 def test_main():
-    with test_support.check_py3k_warnings(("backquote not supported",
-                                             SyntaxWarning)):
+    deprecations = []
+    if sys.py3kwarning:
+        deprecations += [
+            ("backquote not supported", SyntaxWarning),
+            ("the L suffix is not supported in 3.x; drop the suffix", SyntaxWarning)]
+    with test_support.check_warnings(*deprecations):
         test_support.run_unittest(AST_Tests, ASTHelpers_Test)
 
 def main():

Lib/test/test_optparse.py

@@ -1655,9 +1655,8 @@ def test_numeric_options(self):
                              "option -l: invalid long integer value: '0x12x'")
 
     def test_parse_num_3k_warnings(self):
-        expected = 'the L suffix is not supported in 3.x; simply drop the suffix, \
-                    or accept the auto fixer modifications'
-        with check_py3k_warnings((expected, Py3xWarning)):
+        expected = 'the L suffix is not supported in 3.x; drop the suffix'
+        with test_support.check_warnings():
             x = 10L
             y = 8L
             z = x + y

Python/ast.c

@@ -130,19 +130,6 @@ ast_warn(struct compiling *c, const node *n, char *msg)
     return 1;
 }
 
-static int
-ast_3x_warn(struct compiling *c, const node *n, char *msg)
-{
-    if (PyErr_WarnExplicit(PyExc_Py3xWarning, msg, c->c_filename, LINENO(n),
-                           NULL, NULL) < 0) {
-        /* if -Werr, change it to a SyntaxError */
-        if (PyErr_Occurred() && PyErr_ExceptionMatches(PyExc_Py3xWarning))
-            ast_error(n, msg);
-        return 0;
-    }
-    return 1;
-}
-
 static int
 forbidden_check(struct compiling *c, const node *n, const char *x)
 {
@@ -3355,8 +3342,7 @@ parsenumber(struct compiling *c, const node *n, const char *s)
 #endif
         if (*end == 'l' || *end == 'L') {
                 if (Py_Py3kWarningFlag &&
-                    !ast_3x_warn(c, n, "the L suffix is not supported in 3.x; simply drop the suffix, \n" 
-                                 "or accept the auto fixer modifications")) {
+                    !ast_warn(c, n, "the L suffix is not supported in 3.x; drop the suffix")) {
                         return NULL;
                 }
                 return PyLong_FromString((char *)s, (char **)0, 0);