[Python-checkins] cpython (merge 3.2 -> default): Merge 3.2

[petri.lehtinen]

http://hg.python.org/cpython/rev/e3c5f6778ef5
changeset:   73070:e3c5f6778ef5
parent:      73068:eef1027ab2f0
parent:      73069:46c82c4141c9
user:        Petri Lehtinen <petri at digip.org>
date:        Sun Oct 23 21:07:50 2011 +0300
summary:
  Merge 3.2

files:
  Doc/data/refcounts.dat |  2 ++
  1 files changed, 2 insertions(+), 0 deletions(-)


diff --git a/Doc/data/refcounts.dat b/Doc/data/refcounts.dat
--- a/Doc/data/refcounts.dat
+++ b/Doc/data/refcounts.dat
@@ -376,6 +376,8 @@
 PyEval_EvalCode:PyObject*:globals:0:
 PyEval_EvalCode:PyObject*:locals:0:
 
+PyException_GetTraceback:PyObject*::+1:
+
 PyFile_AsFile:FILE*:::
 PyFile_AsFile:PyFileObject*:p:0:
 

-- 
Repository URL: http://hg.python.org/cpython