[Python-checkins] r62051 - in python/trunk: Lib/test/test_ast.py Parser/asdl_c.py Python/Python-ast.c

[georg.brandl]

Author: georg.brandl
Date: Sun Mar 30 21:00:49 2008
New Revision: 62051

Modified:
   python/trunk/Lib/test/test_ast.py
   python/trunk/Parser/asdl_c.py
   python/trunk/Python/Python-ast.c
Log:
Make _fields attr for no fields consistent with _attributes attr.


Modified: python/trunk/Lib/test/test_ast.py
==============================================================================
--- python/trunk/Lib/test/test_ast.py	(original)
+++ python/trunk/Lib/test/test_ast.py	Sun Mar 30 21:00:49 2008
@@ -163,6 +163,9 @@
         self.assertEquals(x.right, 3)
         self.assertEquals(x.lineno, 0)
 
+        # this used to fail because Sub._fields was None
+        x = _ast.Sub()
+
 
 def test_main():
     test_support.run_unittest(AST_Tests)

Modified: python/trunk/Parser/asdl_c.py
==============================================================================
--- python/trunk/Parser/asdl_c.py	(original)
+++ python/trunk/Parser/asdl_c.py	Sun Mar 30 21:00:49 2008
@@ -674,14 +674,9 @@
 {
     PyObject *fnames, *result;
     int i;
-    if (num_fields) {
-        fnames = PyTuple_New(num_fields);
-        if (!fnames) return NULL;
-    } else {
-        fnames = Py_None;
-        Py_INCREF(Py_None);
-    }
-    for(i=0; i < num_fields; i++) {
+    fnames = PyTuple_New(num_fields);
+    if (!fnames) return NULL;
+    for (i = 0; i < num_fields; i++) {
         PyObject *field = PyString_FromString(fields[i]);
         if (!field) {
             Py_DECREF(fnames);

Modified: python/trunk/Python/Python-ast.c
==============================================================================
--- python/trunk/Python/Python-ast.c	(original)
+++ python/trunk/Python/Python-ast.c	Sun Mar 30 21:00:49 2008
@@ -465,14 +465,9 @@
 {
     PyObject *fnames, *result;
     int i;
-    if (num_fields) {
-        fnames = PyTuple_New(num_fields);
-        if (!fnames) return NULL;
-    } else {
-        fnames = Py_None;
-        Py_INCREF(Py_None);
-    }
-    for(i=0; i < num_fields; i++) {
+    fnames = PyTuple_New(num_fields);
+    if (!fnames) return NULL;
+    for (i = 0; i < num_fields; i++) {
         PyObject *field = PyString_FromString(fields[i]);
         if (!field) {
             Py_DECREF(fnames);