[Python-checkins] r73030 - in python/branches/release30-maint: Lib/trace.py Misc/NEWS

[r.david.murray]

Author: r.david.murray
Date: Fri May 29 23:30:55 2009
New Revision: 73030

Log:
Merged revisions 69111 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r69111 | brett.cannon | 2009-01-29 20:31:34 -0500 (Thu, 29 Jan 2009) | 3 lines
  
  The trace module was trying to turn ints into ints since co_lnotab was changed
  to a bytes object.
........


Modified:
   python/branches/release30-maint/   (props changed)
   python/branches/release30-maint/Lib/trace.py
   python/branches/release30-maint/Misc/NEWS

Modified: python/branches/release30-maint/Lib/trace.py
==============================================================================
--- python/branches/release30-maint/Lib/trace.py	(original)
+++ python/branches/release30-maint/Lib/trace.py	Fri May 29 23:30:55 2009
@@ -367,7 +367,7 @@
     """Return dict where keys are lines in the line number table."""
     linenos = {}
 
-    line_increments = [ord(c) for c in code.co_lnotab[1::2]]
+    line_increments = code.co_lnotab[1::2]
     table_length = len(line_increments)
     docstring = False
 

Modified: python/branches/release30-maint/Misc/NEWS
==============================================================================
--- python/branches/release30-maint/Misc/NEWS	(original)
+++ python/branches/release30-maint/Misc/NEWS	Fri May 29 23:30:55 2009
@@ -65,6 +65,9 @@
 Library
 -------
 
+- Fix a bug in the trace module where a bytes object from co_lnotab had its
+  items being passed through ord(). (Fixes Issue #3821)
+
 - smtplib 'login' and 'cram-md5' login are also fixed (see Issue #5259).
 
 - Issue #6121: pydoc now ignores leading and trailing spaces in the