]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
The debugger source view only understood mac-style linefeeds. Fixed.
authorJack Jansen <jack.jansen@cwi.nl>
Wed, 11 Sep 2002 22:05:02 +0000 (22:05 +0000)
committerJack Jansen <jack.jansen@cwi.nl>
Wed, 11 Sep 2002 22:05:02 +0000 (22:05 +0000)
Mac/Tools/IDE/PyDebugger.py

index 74bfc74d34bd997db059eeeb2d816a06fc354c38..250d5d33356601631403385833c8e3cb11a7d976 100644 (file)
@@ -345,7 +345,7 @@ class Debugger(bdb.Bdb):
                                self.w.panes.bottom.src.source.set(editor.get(), filename)
                        else:
                                try:
-                                       f = open(filename, 'rb')
+                                       f = open(filename, 'rT')
                                        data = f.read()
                                        f.close()
                                except IOError:
@@ -360,7 +360,7 @@ class Debugger(bdb.Bdb):
                                                        if f:
                                                                f.close()
                                                        if f and suff == '.py':
-                                                               f = open(filename, 'rb')
+                                                               f = open(filename, 'rT')
                                                                data = f.read()
                                                                f.close()
                                                                self.w.panes.bottom.src.source.set(data, filename)
@@ -369,6 +369,7 @@ class Debugger(bdb.Bdb):
                                        else:
                                                self.w.panes.bottom.src.source.set("can't find file")
                                else:
+                                       data = data.replace('\n', '\r')
                                        self.w.panes.bottom.src.source.set(data, filename)
                        self.file = filename
                self.w.panes.bottom.srctitle.set('Source: ' + filename + ((lineno > 0) and (' (line %d)' % lineno) or ' '))