From: Christian Heimes <christian@cheimes.de>
Date: Fri, 23 Nov 2007 09:10:36 +0000 (+0000)
Subject: Applied patch #1754273 and #1754271 from Thomas Glee
X-Git-Tag: v2.6a1~1019
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=729ab15370c8e7781f4781428364d203eb9f6416;p=python

Applied patch #1754273 and #1754271 from Thomas Glee
The patches are adding deprecation warnings for back ticks and <>
---

diff --git a/Parser/tokenizer.c b/Parser/tokenizer.c
index 4883f46a67..432f94f6f3 100644
--- a/Parser/tokenizer.c
+++ b/Parser/tokenizer.c
@@ -16,6 +16,7 @@
 #include "fileobject.h"
 #include "codecs.h"
 #include "abstract.h"
+#include "pydebug.h"
 #endif /* PGEN */
 
 extern char *PyOS_Readline(FILE *, FILE *, char *);
@@ -982,7 +983,15 @@ PyToken_TwoChars(int c1, int c2)
 		break;
 	case '<':
 		switch (c2) {
-		case '>':	return NOTEQUAL;
+		case '>':
+			{
+#ifndef PGEN
+				if (Py_Py3kWarningFlag)
+					PyErr_WarnEx(PyExc_DeprecationWarning,
+						"<> not supported in 3.x", 1);
+#endif
+				return NOTEQUAL;
+			}
 		case '=':	return LESSEQUAL;
 		case '<':	return LEFTSHIFT;
 		}
diff --git a/Python/ast.c b/Python/ast.c
index 525b5a66f3..5555cf7ddf 100644
--- a/Python/ast.c
+++ b/Python/ast.c
@@ -1336,6 +1336,10 @@ ast_for_atom(struct compiling *c, const node *n)
         return Dict(keys, values, LINENO(n), n->n_col_offset, c->c_arena);
     }
     case BACKQUOTE: { /* repr */
+        if (Py_Py3kWarningFlag &&
+            PyErr_Warn(PyExc_DeprecationWarning,
+                "backquote not supported in 3.x") < 0)
+            return NULL;
         expr_ty expression = ast_for_testlist(c, CHILD(n, 1));
         if (!expression)
             return NULL;