summaryrefslogtreecommitdiffstats
path: root/Lib/idlelib
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2020-07-25 03:38:46 (GMT)
committerGitHub <noreply@github.com>2020-07-25 03:38:46 (GMT)
commit1c562ced2123f4d5a250fe9072ac93504cc41967 (patch)
treefa38e857827db3378a90851ad33fdec395061906 /Lib/idlelib
parent29df301a9236cbae06762d9569e56197d3f5e6ee (diff)
downloadcpython-1c562ced2123f4d5a250fe9072ac93504cc41967.zip
cpython-1c562ced2123f4d5a250fe9072ac93504cc41967.tar.gz
cpython-1c562ced2123f4d5a250fe9072ac93504cc41967.tar.bz2
bpo-41373: IDLE: Fix saving files loaded with no newlines or mixed newlines (GH-21597)
Fixes regression in 3.8.4 and 3.9.0b4. Co-authored-by: Terry Jan Reedy <tjreedy@udel.edu> (cherry picked from commit 0dd463c8a4269137ebed7cc29605c555030df94f) Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
Diffstat (limited to 'Lib/idlelib')
-rw-r--r--Lib/idlelib/iomenu.py11
1 files changed, 11 insertions, 0 deletions
diff --git a/Lib/idlelib/iomenu.py b/Lib/idlelib/iomenu.py
index 74ebefd..8bb2fa6 100644
--- a/Lib/idlelib/iomenu.py
+++ b/Lib/idlelib/iomenu.py
@@ -155,6 +155,17 @@ class IOBinding:
parent=self.text)
return False
+ if not isinstance(eol_convention, str):
+ # If the file does not contain line separators, it is None.
+ # If the file contains mixed line separators, it is a tuple.
+ if eol_convention is not None:
+ tkMessageBox.showwarning("Mixed Newlines",
+ "Mixed newlines detected.\n"
+ "The file will be changed on save.",
+ parent=self.text)
+ converted = True
+ eol_convention = os.linesep # default
+
self.text.delete("1.0", "end")
self.set_filename(None)
self.fileencoding = fileencoding