From: Georg Brandl <georg@python.org>
Date: Wed, 23 Jul 2008 15:16:45 +0000 (+0000)
Subject: 3k-warn about parser's "ast" aliases.
X-Git-Tag: v2.6b3~245
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f9efabb6d216791076bd386dd6c6e33055433910;p=thirdparty%2FPython%2Fcpython.git

3k-warn about parser's "ast" aliases.
---

diff --git a/Doc/library/parser.rst b/Doc/library/parser.rst
index 7df9251e1678..bdd541cd3ea8 100644
--- a/Doc/library/parser.rst
+++ b/Doc/library/parser.rst
@@ -34,6 +34,7 @@ the code forming the application.  It is also faster.
    replaced by "ast"; this is a legacy from the time when there was no other
    AST and has nothing to do with the AST found in Python 2.5.  This is also the
    reason for the functions' keyword arguments being called *ast*, not *st*.
+   The "ast" functions will be removed in Python 3.0.
 
 There are a few things to note about this module which are important to making
 use of the data structures created.  This is not a tutorial on editing the parse
diff --git a/Misc/NEWS b/Misc/NEWS
index 97852ef198c0..53c680d694db 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -26,6 +26,8 @@ Core and Builtins
 Library
 -------
 
+- Deprecate the "ast" parser function aliases.
+
 - Issue #3120: On 64-bit Windows the subprocess module was truncating handles.
 
 - Issue #3303: Fix a crash in locale.strcoll() when calling it with
diff --git a/Modules/parsermodule.c b/Modules/parsermodule.c
index 6e52343e0db1..915bbdc7b2e2 100644
--- a/Modules/parsermodule.c
+++ b/Modules/parsermodule.c
@@ -324,6 +324,14 @@ parser_st2tuple(PyST_Object *self, PyObject *args, PyObject *kw)
     return (res);
 }
 
+static PyObject*
+parser_ast2tuple(PyST_Object *self, PyObject *args, PyObject *kw)
+{
+    if (PyErr_WarnPy3k("ast2tuple is removed in 3.x; use st2tuple", 1) < 0)
+        return NULL;
+    return parser_st2tuple(self, args, kw);
+}
+
 
 /*  parser_st2list(PyObject* self, PyObject* args, PyObject* kw)
  *
@@ -367,6 +375,14 @@ parser_st2list(PyST_Object *self, PyObject *args, PyObject *kw)
     return (res);
 }
 
+static PyObject*
+parser_ast2list(PyST_Object *self, PyObject *args, PyObject *kw)
+{
+    if (PyErr_WarnPy3k("ast2list is removed in 3.x; use st2list", 1) < 0)
+        return NULL;
+    return parser_st2list(self, args, kw);
+}
+
 
 /*  parser_compilest(PyObject* self, PyObject* args)
  *
@@ -396,6 +412,14 @@ parser_compilest(PyST_Object *self, PyObject *args, PyObject *kw)
     return (res);
 }
 
+static PyObject*
+parser_compileast(PyST_Object *self, PyObject *args, PyObject *kw)
+{
+    if (PyErr_WarnPy3k("compileast is removed in 3.x; use compilest", 1) < 0)
+        return NULL;
+    return parser_compilest(self, args, kw);
+}
+
 
 /*  PyObject* parser_isexpr(PyObject* self, PyObject* args)
  *  PyObject* parser_issuite(PyObject* self, PyObject* args)
@@ -634,6 +658,14 @@ parser_tuple2st(PyST_Object *self, PyObject *args, PyObject *kw)
     return st;
 }
 
+static PyObject*
+parser_tuple2ast(PyST_Object *self, PyObject *args, PyObject *kw)
+{
+    if (PyErr_WarnPy3k("tuple2ast is removed in 3.x; use tuple2st", 1) < 0)
+        return NULL;
+    return parser_tuple2st(self, args, kw);
+}
+
 
 /*  node* build_node_children()
  *
@@ -3203,11 +3235,11 @@ parser__pickler(PyObject *self, PyObject *args)
  *  inheritance.
  */
 static PyMethodDef parser_functions[] =  {
-    {"ast2tuple",       (PyCFunction)parser_st2tuple,  PUBLIC_METHOD_TYPE,
+    {"ast2tuple",       (PyCFunction)parser_ast2tuple, PUBLIC_METHOD_TYPE,
         PyDoc_STR("Creates a tuple-tree representation of an ST.")},
-    {"ast2list",        (PyCFunction)parser_st2list,   PUBLIC_METHOD_TYPE,
+    {"ast2list",        (PyCFunction)parser_ast2list,  PUBLIC_METHOD_TYPE,
         PyDoc_STR("Creates a list-tree representation of an ST.")},
-    {"compileast",      (PyCFunction)parser_compilest, PUBLIC_METHOD_TYPE,
+    {"compileast",      (PyCFunction)parser_compileast,PUBLIC_METHOD_TYPE,
         PyDoc_STR("Compiles an ST object into a code object.")},
     {"compilest",      (PyCFunction)parser_compilest,  PUBLIC_METHOD_TYPE,
         PyDoc_STR("Compiles an ST object into a code object.")},
@@ -3219,7 +3251,7 @@ static PyMethodDef parser_functions[] =  {
         PyDoc_STR("Determines if an ST object was created from a suite.")},
     {"suite",           (PyCFunction)parser_suite,     PUBLIC_METHOD_TYPE,
         PyDoc_STR("Creates an ST object from a suite.")},
-    {"sequence2ast",    (PyCFunction)parser_tuple2st,  PUBLIC_METHOD_TYPE,
+    {"sequence2ast",    (PyCFunction)parser_tuple2ast, PUBLIC_METHOD_TYPE,
         PyDoc_STR("Creates an ST object from a tree representation.")},
     {"sequence2st",     (PyCFunction)parser_tuple2st,  PUBLIC_METHOD_TYPE,
         PyDoc_STR("Creates an ST object from a tree representation.")},
@@ -3227,7 +3259,7 @@ static PyMethodDef parser_functions[] =  {
         PyDoc_STR("Creates a tuple-tree representation of an ST.")},
     {"st2list",         (PyCFunction)parser_st2list,   PUBLIC_METHOD_TYPE,
         PyDoc_STR("Creates a list-tree representation of an ST.")},
-    {"tuple2ast",       (PyCFunction)parser_tuple2st,  PUBLIC_METHOD_TYPE,
+    {"tuple2ast",       (PyCFunction)parser_tuple2ast, PUBLIC_METHOD_TYPE,
         PyDoc_STR("Creates an ST object from a tree representation.")},
     {"tuple2st",        (PyCFunction)parser_tuple2st,  PUBLIC_METHOD_TYPE,
         PyDoc_STR("Creates an ST object from a tree representation.")},