Merge heads.

Xavier de Gaye · Xavier de Gaye · commit bbcb79920b0e · 2016-10-28T11:40:47.000+02:00
diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c
@@ -1777,7 +1777,7 @@ var_perform(VarEvent *ev)
         PyErr_NormalizeException(&exc, &val, &tb);
         *(ev->exc_type) = exc;
         *(ev->exc_val) = val;
-        Py_DECREF(tb);
+        Py_XDECREF(tb);
     }
 
 }

Original file line number	Diff line number	Diff line change
`@@ -1777,7 +1777,7 @@ var_perform(VarEvent *ev)`
`1777`	`1777`	`PyErr_NormalizeException(&exc, &val, &tb);`
`1778`	`1778`	`*(ev->exc_type) = exc;`
`1779`	`1779`	`*(ev->exc_val) = val;`
`1780`		`- Py_DECREF(tb);`
	`1780`	`+ Py_XDECREF(tb);`
`1781`	`1781`	`}`
`1782`	`1782`
`1783`	`1783`	`}`