Fixed macroman<->latin1 conversion. Some characters don't exist in latin1, but at...

the correct macroman characters again.

diff --git a/Mac/Tools/IDE/PyDocSearch.py b/Mac/Tools/IDE/PyDocSearch.py
index b036556da11ce26785c29d6d74a3eeb54b1881ee..599c3e0b56dd5ad2da9b0dd72ad2ee472da21fca 100644 (file)
--- a/Mac/Tools/IDE/PyDocSearch.py
+++ b/Mac/Tools/IDE/PyDocSearch.py
@@ -101,7 +101,7 @@ class Results:
 class Status:
        
        def __init__(self):
-               self.w = W.Dialog((440, 64), "Searching\8a")
+               self.w = W.Dialog((440, 64), "Searching\83")
                self.w.searching = W.TextBox((4, 4, -4, 16), "DevDev:PyPyDoc 1.5.1:ext:parseTupleAndKeywords.html")
                self.w.hits = W.TextBox((4, 24, -4, 16), "Hits: 0")
                self.w.canceltip = W.TextBox((4, 44, -4, 16), "Type cmd-period (.) to cancel.")

diff --git a/Mac/Tools/IDE/PythonIDEMain.py b/Mac/Tools/IDE/PythonIDEMain.py
index 3ff7e59a66b0060188785f6b635105a7b617d303..d5677a7a849809e028c39b33afa1e4967b715d54 100644 (file)
--- a/Mac/Tools/IDE/PythonIDEMain.py
+++ b/Mac/Tools/IDE/PythonIDEMain.py
@@ -50,13 +50,13 @@ class PythonIDE(Wapplication.Application):
        def makeusermenus(self):
                m = Wapplication.Menu(self.menubar, "File")
                newitem = FrameWork.MenuItem(m, "New", "N", 'new')
-               openitem = FrameWork.MenuItem(m, "Open\8a", "O", 'open')
+               openitem = FrameWork.MenuItem(m, "Open\83", "O", 'open')
                FrameWork.Separator(m)
                closeitem = FrameWork.MenuItem(m, "Close", "W", 'close')
                saveitem = FrameWork.MenuItem(m, "Save", "S", 'save')
-               saveasitem = FrameWork.MenuItem(m, "Save as\8a", None, 'save_as')
+               saveasitem = FrameWork.MenuItem(m, "Save as\83", None, 'save_as')
                FrameWork.Separator(m)
-               saveasappletitem = FrameWork.MenuItem(m, "Save as Applet\8a", None, 'save_as_applet')
+               saveasappletitem = FrameWork.MenuItem(m, "Save as Applet\83", None, 'save_as_applet')
                FrameWork.Separator(m)
                quititem = FrameWork.MenuItem(m, "Quit", "Q", 'quit')
                
@@ -71,7 +71,7 @@ class PythonIDE(Wapplication.Application):
                selallitem = FrameWork.MenuItem(m, "Select all", "A", "selectall")
                sellineitem = FrameWork.MenuItem(m, "Select line", "L", "selectline")
                FrameWork.Separator(m)
-               finditem = FrameWork.MenuItem(m, "Find\8a", "F", "find")
+               finditem = FrameWork.MenuItem(m, "Find\83", "F", "find")
                findagainitem = FrameWork.MenuItem(m, "Find again", 'G', "findnext")
                enterselitem = FrameWork.MenuItem(m, "Enter search string", "E", "entersearchstring")
                replaceitem = FrameWork.MenuItem(m, "Replace", None, "replace")
@@ -84,12 +84,12 @@ class PythonIDE(Wapplication.Application):
                runitem = FrameWork.MenuItem(m, "Run window", "R", 'run')
                runselitem = FrameWork.MenuItem(m, "Run selection", None, 'runselection')
                FrameWork.Separator(m)
-               moditem = FrameWork.MenuItem(m, "Module browser\8a", "M", self.domenu_modulebrowser)
+               moditem = FrameWork.MenuItem(m, "Module browser\83", "M", self.domenu_modulebrowser)
                FrameWork.Separator(m)
                mm = FrameWork.SubMenu(m, "Preferences")
-               FrameWork.MenuItem(mm, "Set Scripts folder\8a", None, self.do_setscriptsfolder)
-               FrameWork.MenuItem(mm, "Editor default settings\8a", None, self.do_editorprefs)
-               FrameWork.MenuItem(mm, "Set default window font\8a", None, self.do_setwindowfont)
+               FrameWork.MenuItem(mm, "Set Scripts folder\83", None, self.do_setscriptsfolder)
+               FrameWork.MenuItem(mm, "Editor default settings\83", None, self.do_editorprefs)
+               FrameWork.MenuItem(mm, "Set default window font\83", None, self.do_setwindowfont)
                
                self.openwindowsmenu = Wapplication.Menu(self.menubar, 'Windows')
                self.makeopenwindowsmenu()
@@ -110,7 +110,7 @@ class PythonIDE(Wapplication.Application):
                                path = os.path.join(os.getcwd(), "Scripts")
                                if not os.path.exists(path):
                                        os.mkdir(path)
-                                       f = open(os.path.join(path, "Place your scripts here\8a"), "w")
+                                       f = open(os.path.join(path, "Place your scripts here\83"), "w")
                                        f.close()
                        fss = macfs.FSSpec(path)
                        self.scriptsfolder = fss.NewAlias()
@@ -156,10 +156,10 @@ class PythonIDE(Wapplication.Application):
                if ftype == 'TEXT':
                        self.openscript(path)
                else:
-                       W.Message("Can¹t open file of type '%s'." % ftype)
+                       W.Message("CanÕt open file of type '%s'." % ftype)
        
        def getabouttext(self):
-               return "About Python IDE\8a"
+               return "About Python IDE\83"
        
        def do_about(self, id, item, window, event):
                Splash.about()

diff --git a/Mac/Tools/IDE/Splash.py b/Mac/Tools/IDE/Splash.py
index 862d82efa0bbdea4fed9a90be25c8948858f40df..07a51e4d71ffceb96e4c6edf78101af54fca41e8 100644 (file)
--- a/Mac/Tools/IDE/Splash.py
+++ b/Mac/Tools/IDE/Splash.py
@@ -71,7 +71,7 @@ import sys
 
 _keepsplashscreenopen = 0
 
-abouttext1 = """The Python Integrated Development Environment for the Macintosh\81
+abouttext1 = """The Python Integrated Development Environment for the Macintosh\8e
 Version: %s
 Copyright 1997-2000 Just van Rossum, Letterror. <just@letterror.com>
 Python %s
@@ -79,11 +79,11 @@ Python %s
 See: <http://www.python.org/> for information and documentation."""
 
 flauwekul = [  'Goodday, Bruce.', 
-                       'What¹s new?', 
+                       'WhatÕs new?', 
                        'Nudge, nudge, say no more!', 
-                       'No, no sir, it¹s not dead. It¹s resting.',
+                       'No, no sir, itÕs not dead. ItÕs resting.',
                        'Albatros!',
-                       'It¹s . . .',
+                       'ItÕs . . .',
                        'Is your name not Bruce, then?',
                        """But Mr F.G. Superman has a secret identity . . . 
 when trouble strikes at any time . . . 

diff --git a/Mac/Tools/IDE/Wapplication.py b/Mac/Tools/IDE/Wapplication.py
index 88c415ce530094c9f80f7fff5c65a513196ec97d..540fca08c4579b9ca98bbc27922bf03dc61953a7 100644 (file)
--- a/Mac/Tools/IDE/Wapplication.py
+++ b/Mac/Tools/IDE/Wapplication.py
@@ -344,18 +344,18 @@ class Application(FrameWork.Application):
                                # XXX and that's the last thing we want here.
                                f, filename, (suff, mode, dummy) = imp.find_module(modname)
                        except ImportError:
-                               raise W.AlertError, "Can¹t find file for ³%s²" % modname
+                               raise W.AlertError, "CanÕt find file for \96%s\94" % modname
                        else:
                                if not f:
-                                       raise W.AlertError, "Can¹t find file for ³%s²" % modname
+                                       raise W.AlertError, "CanÕt find file for \96%s\94" % modname
                                f.close()
                        if suff == '.py':
                                self.openscript(filename, lineno, charoffset)
                                return
                        else:
-                               raise W.AlertError, "Can¹t find file for ³%s²" % modname
+                               raise W.AlertError, "CanÕt find file for \96%s\94" % modname
                else:
-                       raise W.AlertError, "Can¹t find file \8c%s¹" % filename
+                       raise W.AlertError, "CanÕt find file \95%sÕ" % filename
                if lineno is not None:
                        editor.selectline(lineno, charoffset)
                return editor

diff --git a/Mac/Tools/IDE/Wtext.py b/Mac/Tools/IDE/Wtext.py
index 41ea5ec818e2fd0fbef6578f892be459a58ca2dc..b87008b6e7006f26f04bf5266466caf10bd2ad40 100644 (file)
--- a/Mac/Tools/IDE/Wtext.py
+++ b/Mac/Tools/IDE/Wtext.py
@@ -871,7 +871,7 @@ class PyEditor(TextEditor):
                        if onoff:
                                if not __debug__:
                                        import W
-                                       raise W.AlertError, "Can¹t debug in ³Optimize bytecode² mode.\r(see ³Default startup options² in EditPythonPreferences)"
+                                       raise W.AlertError, "CanÕt debug in \96Optimize bytecode\94 mode.\r(see \96Default startup options\94 in EditPythonPreferences)"
                                import PyDebugger
                                self._debugger = PyDebugger.getdebugger()
                                self._debugger.register_editor(self, self.file)

diff --git a/Mac/Tools/IDE/Wtraceback.py b/Mac/Tools/IDE/Wtraceback.py
index 9b54b175e3639330b7c37656a9ec3602ed10dcea..10894a8952646be8712345e58e753bed8baf6a32 100644 (file)
--- a/Mac/Tools/IDE/Wtraceback.py
+++ b/Mac/Tools/IDE/Wtraceback.py
@@ -57,7 +57,7 @@ class TraceBack:
                        filename = os.path.split(filename)[1]
                if lineno:
                        charno = charno - 1
-                       text = str(value) + '\rFile: "' + str(filename) + '", line ' + str(lineno) + '\r\r' + line[:charno] + "\80" + line[charno:-1]
+                       text = str(value) + '\rFile: "' + str(filename) + '", line ' + str(lineno) + '\r\r' + line[:charno] + "\82" + line[charno:-1]
                else:
                        text = str(value) + '\rFile: "' + str(filename) + '"'
                self.syntaxdialog = W.ModalDialog((360, 120), "Syntax Error")
@@ -123,10 +123,10 @@ class TraceBack:
                self.w.editbutton = W.Button((10, -30, 60, 16), "Edit", self.edit)
                self.w.editbutton.enable(0)
                
-               self.w.browselocalsbutton = W.Button((80, -30, 100, 16), "Browse locals\8a", self.browselocals)
+               self.w.browselocalsbutton = W.Button((80, -30, 100, 16), "Browse locals\83", self.browselocals)
                self.w.browselocalsbutton.enable(0)
                
-               self.w.postmortembutton = W.Button((190, -30, 100, 16), "Post mortem\8a", self.postmortem)
+               self.w.postmortembutton = W.Button((190, -30, 100, 16), "Post mortem\83", self.postmortem)
                
                self.w.setdefaultbutton(self.w.editbutton)
                self.w.bind("cmdb", self.w.browselocalsbutton.push)

diff --git a/Mac/Tools/IDE/Wwindows.py b/Mac/Tools/IDE/Wwindows.py
index 2d449c7532cdab2c76282fa250279100ef2f1c34..e16c647cc59ed607ea48859e855ba854df75f81e 100644 (file)
--- a/Mac/Tools/IDE/Wwindows.py
+++ b/Mac/Tools/IDE/Wwindows.py
@@ -568,7 +568,7 @@ def FrontWindowInsert(stuff):
                                pass
        import EasyDialogs
        if EasyDialogs.AskYesNoCancel(
-                       "Can¹t find window or widget to insert text into; copy to clipboard instead?", 
+                       "CanÕt find window or widget to insert text into; copy to clipboard instead?", 
                        1) == 1:
                import Scrap
                Scrap.ZeroScrap()