#7372: fix regression in pstats: a previous fix to handle cProfile data in add_callers broke handling of profile data.
diff --git a/Lib/pstats.py b/Lib/pstats.py
index 3740d92..4bb5cf1 100644
--- a/Lib/pstats.py
+++ b/Lib/pstats.py
@@ -506,8 +506,13 @@
new_callers[func] = caller
for func, caller in source.items():
if func in new_callers:
- new_callers[func] = tuple([i[0] + i[1] for i in
- zip(caller, new_callers[func])])
+ if isinstance(caller, tuple):
+ # format used by cProfile
+ new_callers[func] = tuple([i[0] + i[1] for i in
+ zip(caller, new_callers[func])])
+ else:
+ # format used by profile
+ new_callers[func] += caller
else:
new_callers[func] = caller
return new_callers