From 4e6b3c55d0a045e37725a0eb6c7a0dfcd4d4084b Mon Sep 17 00:00:00 2001 From: Just van Rossum Date: Tue, 18 Nov 2003 22:41:16 +0000 Subject: Fix for [ 782686 ]: new files used \r as the default line separator instead of os.linesep. --- Mac/Tools/IDE/PyEdit.py | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/Mac/Tools/IDE/PyEdit.py b/Mac/Tools/IDE/PyEdit.py index 502f7c4..0ad7a8a 100644 --- a/Mac/Tools/IDE/PyEdit.py +++ b/Mac/Tools/IDE/PyEdit.py @@ -57,21 +57,18 @@ class Editor(W.Window): f.close() self._creator, filetype = MacOS.GetCreatorAndType(path) self.addrecentfile(path) + if '\n' in text: + if string.find(text, '\r\n') >= 0: + self._eoln = '\r\n' + else: + self._eoln = '\n' + text = string.replace(text, self._eoln, '\r') + else: + self._eoln = '\r' else: raise IOError, "file '%s' does not exist" % path self.path = path - if '\n' in text: - if string.find(text, '\r\n') >= 0: - self._eoln = '\r\n' - else: - self._eoln = '\n' - text = string.replace(text, self._eoln, '\r') - change = 0 - else: - change = 0 - self._eoln = '\r' - self.settings = {} if self.path: self.readwindowsettings() @@ -93,8 +90,6 @@ class Editor(W.Window): W.Window.__init__(self, bounds, self.title, minsize = (330, 120), tabbable = 0) self.setupwidgets(text) - if change > 0: - self.editgroup.editor.textchanged() if self.settings.has_key("selection"): selstart, selend = self.settings["selection"] -- cgit v0.12