Commit 56e8878a authored by Robert Bradshaw's avatar Robert Bradshaw

merge

parents dfbb24da 4dbdde33
...@@ -2062,12 +2062,12 @@ class SequenceNode(ExprNode): ...@@ -2062,12 +2062,12 @@ class SequenceNode(ExprNode):
rhs.py_result(), rhs.py_result(),
rhs.py_result(), rhs.py_result(),
len(self.args))) len(self.args)))
code.putln("PyObject* tuple = %s;" % rhs.py_result())
for i in range(len(self.args)): for i in range(len(self.args)):
item = self.unpacked_items[i] item = self.unpacked_items[i]
code.putln( code.putln(
"%s = PyTuple_GET_ITEM(%s, %s);" % ( "%s = PyTuple_GET_ITEM(tuple, %s);" % (
item.result_code, item.result_code,
rhs.py_result(),
i)) i))
code.put_incref(item.result_code, item.ctype()) code.put_incref(item.result_code, item.ctype())
value_node = self.coerced_unpacked_items[i] value_node = self.coerced_unpacked_items[i]
......
...@@ -797,7 +797,7 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode): ...@@ -797,7 +797,7 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode):
code.putln("}") code.putln("}")
for entry in py_attrs: for entry in py_attrs:
name = "p->%s" % entry.cname name = "p->%s" % entry.cname
code.putln("tmp = %s;" % code.as_pyobject(name, entry.type)) code.putln("tmp = ((PyObject*)%s);" % name)
code.put_init_to_py_none(name, entry.type) code.put_init_to_py_none(name, entry.type)
code.putln("Py_XDECREF(tmp);") code.putln("Py_XDECREF(tmp);")
code.putln( code.putln(
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment