Kaydet (Commit) 2ad9419c authored tarafından Just van Rossum's avatar Just van Rossum

minor fixes, removed obsolete warning

üst 6b7d69d9
...@@ -10,6 +10,7 @@ import MacOS ...@@ -10,6 +10,7 @@ import MacOS
from Carbon import Win from Carbon import Win
from Carbon import Res from Carbon import Res
from Carbon import Evt from Carbon import Evt
from Carbon import Qd
import os import os
import imp import imp
import sys import sys
...@@ -365,7 +366,6 @@ class Editor(W.Window): ...@@ -365,7 +366,6 @@ class Editor(W.Window):
def close(self): def close(self):
if self.editgroup.editor.changed: if self.editgroup.editor.changed:
import EasyDialogs import EasyDialogs
from Carbon import Qd
Qd.InitCursor() Qd.InitCursor()
save = EasyDialogs.AskYesNoCancel('Save window "%s" before closing?' % self.title, save = EasyDialogs.AskYesNoCancel('Save window "%s" before closing?' % self.title,
default=1, no="Don\xd5t save") default=1, no="Don\xd5t save")
...@@ -509,7 +509,7 @@ class Editor(W.Window): ...@@ -509,7 +509,7 @@ class Editor(W.Window):
if self.run_with_interpreter: if self.run_with_interpreter:
if self.editgroup.editor.changed: if self.editgroup.editor.changed:
import EasyDialogs import EasyDialogs
import Qd; Qd.InitCursor() Qd.InitCursor()
save = EasyDialogs.AskYesNoCancel('Save "%s" before running?' % self.title, 1) save = EasyDialogs.AskYesNoCancel('Save "%s" before running?' % self.title, 1)
if save > 0: if save > 0:
if self.domenu_save(): if self.domenu_save():
...@@ -520,16 +520,9 @@ class Editor(W.Window): ...@@ -520,16 +520,9 @@ class Editor(W.Window):
raise W.AlertError, "Can't run unsaved file" raise W.AlertError, "Can't run unsaved file"
self._run_with_interpreter() self._run_with_interpreter()
elif self.run_with_cl_interpreter: elif self.run_with_cl_interpreter:
# Until universal newline support
if self._eoln != '\n':
import EasyDialogs
ok = EasyDialogs.AskYesNoCancel('Warning: "%s" does not have Unix line-endings'
% self.title, 1, yes='OK', no='')
if not ok:
return
if self.editgroup.editor.changed: if self.editgroup.editor.changed:
import EasyDialogs import EasyDialogs
import Qd; Qd.InitCursor() Qd.InitCursor()
save = EasyDialogs.AskYesNoCancel('Save "%s" before running?' % self.title, 1) save = EasyDialogs.AskYesNoCancel('Save "%s" before running?' % self.title, 1)
if save > 0: if save > 0:
if self.domenu_save(): if self.domenu_save():
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment