Applied patch #1754273 and #1754271 from Thomas Glee

The patches are adding deprecation warnings for back ticks and <>
This commit is contained in:
Christian Heimes 2007-11-23 09:10:36 +00:00
parent 2336111aef
commit 729ab15370
2 changed files with 14 additions and 1 deletions

View File

@ -16,6 +16,7 @@
#include "fileobject.h" #include "fileobject.h"
#include "codecs.h" #include "codecs.h"
#include "abstract.h" #include "abstract.h"
#include "pydebug.h"
#endif /* PGEN */ #endif /* PGEN */
extern char *PyOS_Readline(FILE *, FILE *, char *); extern char *PyOS_Readline(FILE *, FILE *, char *);
@ -982,7 +983,15 @@ PyToken_TwoChars(int c1, int c2)
break; break;
case '<': case '<':
switch (c2) { 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 LESSEQUAL;
case '<': return LEFTSHIFT; case '<': return LEFTSHIFT;
} }

View File

@ -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); return Dict(keys, values, LINENO(n), n->n_col_offset, c->c_arena);
} }
case BACKQUOTE: { /* repr */ 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)); expr_ty expression = ast_for_testlist(c, CHILD(n, 1));
if (!expression) if (!expression)
return NULL; return NULL;