Merged revisions 67797 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r67797 | amaury.forgeotdarc | 2008-12-15 22:47:57 +0100 (Mon, 15 Dec 2008) | 4 lines

  #3954: Fix error handling code in _hotshot.logreader

  Will port to 2.6. hotshot was deleted from python 3.
........
diff --git a/Misc/NEWS b/Misc/NEWS
index a3da314..43f5ce7 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -32,6 +32,9 @@
 Library
 -------
 
+- Issue #3954: Fix a potential SystemError in _hotshot.logreader error
+  handling.
+
 - Issue #4574: fix a crash in io.IncrementalNewlineDecoder when a carriage
   return encodes to more than one byte in the source encoding (e.g. UTF-16)
   and gets split on a chunk boundary.