From: R. David Murray <rdmurray@bitdance.com>
Date: Fri, 29 May 2009 21:30:55 +0000 (+0000)
Subject: Merged revisions 69111 via svnmerge from
X-Git-Tag: 3.0~45
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=19563618a661df4d00a1388ae26ed4f8809df344;p=thirdparty%2FPython%2Fcpython.git

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.
........
---

diff --git a/Lib/trace.py b/Lib/trace.py
index a5c2f1104bec..a272683d9572 100644
--- a/Lib/trace.py
+++ b/Lib/trace.py
@@ -367,7 +367,7 @@ def find_lines_from_code(code, strs):
     """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
 
diff --git a/Misc/NEWS b/Misc/NEWS
index 5806c0b65ea5..a35379429b60 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -65,6 +65,9 @@ Core and Builtins
 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