mirror of
https://github.com/python/cpython.git
synced 2025-08-04 08:59:19 +00:00
Fixed macroman<->latin1 conversion. Some chars don't
exist in latin1, but at least the roundtrip results in the same macroman characters.
This commit is contained in:
Jack Jansen
parent
dfebe90c4c
commit
6f84ed5afc
48 changed files with 234 additions and 232 deletions
|
|
@ -14,9 +14,9 @@ class _modulebrowser:
|
|||
|
||||
#self.window.bevelbox = W.BevelBox((0, 0, 0, 56))
|
||||
self.window.openbutton = W.Button((10, 8, 80, 16), "Open", self.openbuttonhit)
|
||||
self.window.browsebutton = W.Button((100, 8, 80, 16), "BrowseŠ", self.browsebuttonhit)
|
||||
self.window.browsebutton = W.Button((100, 8, 80, 16), "Browseƒ", self.browsebuttonhit)
|
||||
self.window.reloadbutton = W.Button((10, 32, 80, 16), "Reload", self.reloadbuttonhit)
|
||||
self.window.openotherbutton = W.Button((100, 32, 80, 16), "Open otherŠ", self.openother)
|
||||
self.window.openotherbutton = W.Button((100, 32, 80, 16), "Open otherƒ", self.openother)
|
||||
|
||||
self.window.openbutton.enable(0)
|
||||
self.window.reloadbutton.enable(0)
|
||||
|
|
@ -81,7 +81,7 @@ class _modulebrowser:
|
|||
file, path, description = imp.find_module(modname)
|
||||
except ImportError:
|
||||
W.SetCursor("arrow")
|
||||
W.Message("Can¹t find file for module ³%s²."
|
||||
W.Message("CanÕt find file for module –%s”."
|
||||
% modname)
|
||||
else:
|
||||
self.openscript(path, modname)
|
||||
|
|
@ -93,7 +93,7 @@ class _modulebrowser:
|
|||
elif path[-4:] in ['.pyc', '.pyo']:
|
||||
W.getapplication().openscript(path[:-1], modname=modname)
|
||||
else:
|
||||
W.Message("Can¹t edit ³%s²; it might be a shared library or a .pyc file."
|
||||
W.Message("CanÕt edit –%s”; it might be a shared library or a .pyc file."
|
||||
% modname)
|
||||
|
||||
def openother(self):
|
||||
|
|
@ -106,9 +106,9 @@ class _modulebrowser:
|
|||
file, path, description = imp.find_module(modname)
|
||||
except ImportError:
|
||||
if modname in sys.builtin_module_names:
|
||||
alerttext = "³%s² is a builtin module, which you can¹t edit." % modname
|
||||
alerttext = "–%s” is a builtin module, which you canÕt edit." % modname
|
||||
else:
|
||||
alerttext = "No module named ³%s²." % modname
|
||||
alerttext = "No module named –%s”." % modname
|
||||
raise W.AlertError, alerttext
|
||||
self.openscript(path, modname)
|
||||
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ def double_repr(key, value, truncvalue = 0,
|
|||
value = _repr(value)
|
||||
'' + value # test to see if it is a string, in case a __repr__ method is buggy
|
||||
except:
|
||||
value = '€€€ exception in repr()'
|
||||
value = '‚‚‚ exception in repr()'
|
||||
if truncvalue:
|
||||
return key + '\t' + value[:255]
|
||||
return key + '\t' + value
|
||||
|
|
@ -360,7 +360,7 @@ INDEXING_TYPES = (
|
|||
def unpack_object(object, indent = 0):
|
||||
tp = type(object)
|
||||
if tp in SIMPLE_TYPES and tp is not types.NoneType:
|
||||
raise TypeError, 'can¹t browse simple type: %s' % tp.__name__
|
||||
raise TypeError, 'canÕt browse simple type: %s' % tp.__name__
|
||||
elif tp == types.DictionaryType:
|
||||
return unpack_dict(object, indent)
|
||||
elif tp in (types.TupleType, types.ListType):
|
||||
|
|
|
|||
|
|
@ -156,8 +156,8 @@ class PyConsole(W.Window):
|
|||
def makenamespacemenu(self, *args):
|
||||
W.SetCursor('watch')
|
||||
namespacelist = self.getnamespacelist()
|
||||
self.namespacemenu.set([("Clear window", self.clearbuffer), ("Font settingsŠ", self.dofontsettings),
|
||||
["Namespace"] + namespacelist, ("Browse namespaceŠ", self.browsenamespace)])
|
||||
self.namespacemenu.set([("Clear window", self.clearbuffer), ("Font settingsƒ", self.dofontsettings),
|
||||
["Namespace"] + namespacelist, ("Browse namespaceƒ", self.browsenamespace)])
|
||||
currentname = self.consoletext._namespace["__name__"]
|
||||
for i in range(len(namespacelist)):
|
||||
if namespacelist[i][0] == currentname:
|
||||
|
|
@ -264,7 +264,7 @@ class PyOutput:
|
|||
tabbable = 0)
|
||||
self.w.outputtext = OutputTextWidget((-1, -1, -14, 1), inset = (6, 5),
|
||||
fontsettings = self.fontsettings, tabsettings = self.tabsettings, readonly = 1)
|
||||
menuitems = [("Clear window", self.clearbuffer), ("Font settingsŠ", self.dofontsettings)]
|
||||
menuitems = [("Clear window", self.clearbuffer), ("Font settingsƒ", self.dofontsettings)]
|
||||
self.w.popupmenu = W.PopupMenu((-15, -1, 16, 16), menuitems)
|
||||
|
||||
self.w._bary = W.Scrollbar((-15, 14, 16, -14), self.w.outputtext.vscroll, max = 32767)
|
||||
|
|
|
|||
|
|
@ -72,7 +72,7 @@ class Debugger(bdb.Bdb):
|
|||
self.botframe = bottomframe
|
||||
if running:
|
||||
self.set_continue()
|
||||
self.reason = 'RunningŠ'
|
||||
self.reason = 'Runningƒ'
|
||||
self.setstate('running')
|
||||
else:
|
||||
self.set_step()
|
||||
|
|
@ -187,7 +187,7 @@ class Debugger(bdb.Bdb):
|
|||
def makeoptionsmenu(self):
|
||||
options = [('Clear breakpoints', self.w.panes.bottom.src.source.clearbreakpoints),
|
||||
('Clear all breakpoints', self.clear_all_breaks),
|
||||
('Edit breakpointsŠ', self.edit_breaks), '-',
|
||||
('Edit breakpointsƒ', self.edit_breaks), '-',
|
||||
(self.tracemagic and
|
||||
'Disable __magic__ tracing' or 'Enable __magic__ tracing', self.togglemagic)]
|
||||
self.w.panes.bottom.src.optionsmenu.set(options)
|
||||
|
|
@ -318,7 +318,7 @@ class Debugger(bdb.Bdb):
|
|||
|
||||
def running(self):
|
||||
W.SetCursor('watch')
|
||||
self.reason = 'RunningŠ'
|
||||
self.reason = 'Runningƒ'
|
||||
self.setstate('running')
|
||||
#self.w.panes.bottom.src.source.set('')
|
||||
#self.w.panes.browserpanes.stacklist.stack.set([])
|
||||
|
|
@ -350,7 +350,7 @@ class Debugger(bdb.Bdb):
|
|||
try:
|
||||
f, filename, (suff, mode, dummy) = imp.find_module(modname)
|
||||
except ImportError:
|
||||
self.w.panes.bottom.src.source.set('can¹t find file')
|
||||
self.w.panes.bottom.src.source.set('canÕt find file')
|
||||
else:
|
||||
if f:
|
||||
f.close()
|
||||
|
|
@ -360,9 +360,9 @@ class Debugger(bdb.Bdb):
|
|||
f.close()
|
||||
self.w.panes.bottom.src.source.set(data, filename)
|
||||
else:
|
||||
self.w.panes.bottom.src.source.set('can¹t find file')
|
||||
self.w.panes.bottom.src.source.set('canÕt find file')
|
||||
else:
|
||||
self.w.panes.bottom.src.source.set('can¹t find file')
|
||||
self.w.panes.bottom.src.source.set('canÕt find file')
|
||||
else:
|
||||
self.w.panes.bottom.src.source.set(data, filename)
|
||||
self.file = filename
|
||||
|
|
@ -682,7 +682,7 @@ class BreakpointsViewer:
|
|||
self.w.panes.files = W.List(None, callback = self.filehit) #, flags = Lists.lOnlyOne)
|
||||
self.w.panes.gr = W.Group(None)
|
||||
self.w.panes.gr.breaks = W.List((0, 0, -130, 0), callback = self.linehit) #, flags = Lists.lOnlyOne)
|
||||
self.w.panes.gr.openbutton = W.Button((-80, 4, 0, 16), 'ViewŠ', self.openbuttonhit)
|
||||
self.w.panes.gr.openbutton = W.Button((-80, 4, 0, 16), 'Viewƒ', self.openbuttonhit)
|
||||
self.w.panes.gr.deletebutton = W.Button((-80, 28, 0, 16), 'Delete', self.deletebuttonhit)
|
||||
|
||||
self.w.bind('<close>', self.close)
|
||||
|
|
@ -880,7 +880,7 @@ _debugger = None
|
|||
|
||||
def getdebugger():
|
||||
if not __debug__:
|
||||
raise W.AlertError, "Can¹t debug in ³Optimize bytecode² mode.\r(see ³Default startup options² in EditPythonPreferences)"
|
||||
raise W.AlertError, "CanÕt debug in –Optimize bytecode” mode.\r(see –Default startup options” in EditPythonPreferences)"
|
||||
global _debugger
|
||||
if _debugger is None:
|
||||
_debugger = Debugger()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue