commit c5356994edac98da01305f7664182c4a6ed57b9d
author Georg Brandl <georg@python.org> Sun Aug 01 22:02:09 2010 +0000
committer Georg Brandl <georg@python.org> Sun Aug 01 22:02:09 2010 +0000
tree f08fe905e783793b29adc8485cd4cd2f384976ab
parent 0ba1f01adfe9132340324203e10671cf9b419b1c

Merged revisions 83354,83365 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/release27-maint

........
  r83354 | georg.brandl | 2010-07-31 21:07:37 +0200 (Sa, 31 Jul 2010) | 1 line

  #9328: string format methods return strings.
........
  r83365 | georg.brandl | 2010-07-31 23:22:36 +0200 (Sa, 31 Jul 2010) | 1 line

  #1019882: if start() and stop() were not in the same stack frame, stats.load() would crash with IndexError.
........

Lib/hotshot/log.py

diff --git a/Lib/hotshot/log.py b/Lib/hotshot/log.py
index 99d0729..b7ce259 100644
--- a/Lib/hotshot/log.py
+++ b/Lib/hotshot/log.py
@@ -106,7 +106,10 @@
                 return what, t, tdelta
 
             if what == WHAT_EXIT:
-                return what, self._pop(), tdelta
+                try:
+                    return what, self._pop(), tdelta
+                except IndexError:
+                    raise StopIteration
 
             if what == WHAT_LINENO:
                 filename, firstlineno, funcname = self._stack[-1]