mirror of
https://github.com/python/cpython.git
synced 2025-08-03 16:39:00 +00:00
[3.12] gh-104799: Default missing lists in AST to the empty list (GH-104834) (#105213)
(cherry picked from commit 77d2579586
)
Co-authored-by: Jelle Zijlstra <jelle.zijlstra@gmail.com>
Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
This commit is contained in:
parent
d57ee813eb
commit
e6d5e63614
4 changed files with 400 additions and 239 deletions
|
@ -632,29 +632,38 @@ class Obj2ModVisitor(PickleVisitor):
|
|||
self.emit(line % field.name, depth)
|
||||
self.emit("return 1;", depth+1)
|
||||
self.emit("}", depth)
|
||||
if not field.opt:
|
||||
if field.seq:
|
||||
self.emit("if (tmp == NULL) {", depth)
|
||||
message = "required field \\\"%s\\\" missing from %s" % (field.name, name)
|
||||
format = "PyErr_SetString(PyExc_TypeError, \"%s\");"
|
||||
self.emit(format % message, depth+1, reflow=False)
|
||||
self.emit("return 1;", depth+1)
|
||||
self.emit("tmp = PyList_New(0);", depth+1)
|
||||
self.emit("if (tmp == NULL) {", depth+1)
|
||||
self.emit("return 1;", depth+2)
|
||||
self.emit("}", depth+1)
|
||||
self.emit("}", depth)
|
||||
self.emit("{", depth)
|
||||
else:
|
||||
self.emit("if (tmp == NULL || tmp == Py_None) {", depth)
|
||||
self.emit("Py_CLEAR(tmp);", depth+1)
|
||||
if self.isNumeric(field):
|
||||
if field.name in self.attribute_special_defaults:
|
||||
self.emit(
|
||||
"%s = %s;" % (field.name, self.attribute_special_defaults[field.name]),
|
||||
depth+1,
|
||||
)
|
||||
else:
|
||||
self.emit("%s = 0;" % field.name, depth+1)
|
||||
elif not self.isSimpleType(field):
|
||||
self.emit("%s = NULL;" % field.name, depth+1)
|
||||
if not field.opt:
|
||||
self.emit("if (tmp == NULL) {", depth)
|
||||
message = "required field \\\"%s\\\" missing from %s" % (field.name, name)
|
||||
format = "PyErr_SetString(PyExc_TypeError, \"%s\");"
|
||||
self.emit(format % message, depth+1, reflow=False)
|
||||
self.emit("return 1;", depth+1)
|
||||
else:
|
||||
raise TypeError("could not determine the default value for %s" % field.name)
|
||||
self.emit("}", depth)
|
||||
self.emit("else {", depth)
|
||||
self.emit("if (tmp == NULL || tmp == Py_None) {", depth)
|
||||
self.emit("Py_CLEAR(tmp);", depth+1)
|
||||
if self.isNumeric(field):
|
||||
if field.name in self.attribute_special_defaults:
|
||||
self.emit(
|
||||
"%s = %s;" % (field.name, self.attribute_special_defaults[field.name]),
|
||||
depth+1,
|
||||
)
|
||||
else:
|
||||
self.emit("%s = 0;" % field.name, depth+1)
|
||||
elif not self.isSimpleType(field):
|
||||
self.emit("%s = NULL;" % field.name, depth+1)
|
||||
else:
|
||||
raise TypeError("could not determine the default value for %s" % field.name)
|
||||
self.emit("}", depth)
|
||||
self.emit("else {", depth)
|
||||
|
||||
self.emit("int res;", depth+1)
|
||||
if field.seq:
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue