Mercurial Repositories > eric / changeset
changeset
Removed (commented out) the encoding/decoding related stuff of Utilities.
Fri, 08 Jan 2010 19:14:19 +0000
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Fri, 08 Jan 2010 19:14:19 +0000
- changeset 41
- 572a009369f0
- parent 40
- c2e5472b112c
- child 42
- 23b45a742e17
Removed (commented out) the encoding/decoding related stuff of Utilities.
--- a/APIs/Python3/eric5.api Fri Jan 08 17:04:18 2010 +0000 +++ b/APIs/Python3/eric5.api Fri Jan 08 19:14:19 2010 +0000 @@ -5111,7 +5111,6 @@ eric5.Utilities.ClassBrowsers.rbclbr._modules?8 eric5.Utilities.ClassBrowsers.rbclbr.readmodule_ex?4(module, path=[]) eric5.Utilities.ClassBrowsers.readmodule?4(module, path=[], isPyFile = False) -eric5.Utilities.CodingError?1(coding) eric5.Utilities.ModuleParser.Attribute?1(module, name, file, lineno) eric5.Utilities.ModuleParser.Class.addAttribute?4(name, attr) eric5.Utilities.ModuleParser.Class.addDescription?4(description) @@ -5180,14 +5179,11 @@ eric5.Utilities._escape_map?8 eric5.Utilities._percentReplacementFunc?5(matchobj) eric5.Utilities._uescape?8 -eric5.Utilities.coding_regexps?7 eric5.Utilities.compactPath?4(path, width, measure = len) eric5.Utilities.compile?4(file, codestring = "") eric5.Utilities.configDir?7 eric5.Utilities.convertLineEnds?4(text, eol) -eric5.Utilities.decode?4(text) eric5.Utilities.direntries?4(path, filesonly=False, pattern=None, followsymlinks=True, checkStop=None) -eric5.Utilities.encode?4(text, orig_coding) eric5.Utilities.escape_entities?4(m, map=_escape_map) eric5.Utilities.escape_uentities?4(m) eric5.Utilities.fromNativeSeparators?4(path) @@ -5207,7 +5203,6 @@ eric5.Utilities.getPythonVersion?4() eric5.Utilities.getTestFileName?4(fn) eric5.Utilities.getUserName?4() -eric5.Utilities.get_coding?4(text) eric5.Utilities.hasEnvironmentEntry?4(key) eric5.Utilities.html_encode?4(text, pattern=_escape) eric5.Utilities.html_uencode?4(text, pattern=_uescape) @@ -5233,7 +5228,6 @@ eric5.Utilities.splitPath?4(name) eric5.Utilities.supportedCodecs?7 eric5.Utilities.toNativeSeparators?4(path) -eric5.Utilities.toUnicode?4(s) eric5.Utilities.uic.compileUiDir?4(dir, recurse = False, map = None, **compileUi_args) eric5.Utilities.uic.compileUiFiles?4(dir, recurse = False) eric5.Utilities.uic.compile_ui?4(ui_dir, ui_file)
--- a/Debugger/VariablesViewer.py Fri Jan 08 17:04:18 2010 +0000 +++ b/Debugger/VariablesViewer.py Fri Jan 08 19:14:19 2010 +0000 @@ -18,7 +18,7 @@ from .Config import ConfigVarTypeDispStrings, ConfigVarTypeStrings from .VariableDetailDialog import VariableDetailDialog -from Utilities import toUnicode +##from Utilities import toUnicode import Preferences @@ -515,24 +515,24 @@ else: return VariableItem(parent, dvar, dvalue, dtype) - def __unicode(self, s): - """ - Private method to convert a string to unicode. - - @param s the string to be converted (string) - @return unicode representation of s (unicode object) - """ - # TODO: remove me - if isinstance(s, type("")): - return s - try: - u = str(s, self.loc) - except TypeError: - u = str(s) - except UnicodeError: - u = toUnicode(s) - return u - +## def __unicode(self, s): +## """ +## Private method to convert a string to unicode. +## +## @param s the string to be converted (string) +## @return unicode representation of s (unicode object) +## """ +## # TODO: remove me +## if isinstance(s, type("")): +## return s +## try: +## u = str(s, self.loc) +## except TypeError: +## u = str(s) +## except UnicodeError: +## u = toUnicode(s) +## return u +## def __addItem(self, parent, vtype, var, value): """ Private method used to add an item to the list. @@ -568,7 +568,8 @@ sval = eval(value) except: sval = value - itm = self.__generateItem(parent, dvar, self.__unicode(sval), dvtype) +## itm = self.__generateItem(parent, dvar, self.__unicode(sval), dvtype) + itm = self.__generateItem(parent, dvar, str(sval), dvtype) else: itm = self.__generateItem(parent, dvar, value, dvtype)
--- a/Documentation/Help/source.qhp Fri Jan 08 17:04:18 2010 +0000 +++ b/Documentation/Help/source.qhp Fri Jan 08 19:14:19 2010 +0000 @@ -35,7 +35,7 @@ <section title="eric5.DebugClients.Python.DebugThread" ref="eric5.DebugClients.Python.DebugThread.html" /> <section title="eric5.DebugClients.Python.FlexCompleter" ref="eric5.DebugClients.Python.FlexCompleter.html" /> <section title="eric5.DebugClients.Python.PyProfile" ref="eric5.DebugClients.Python.PyProfile.html" /> - <section title="eric5.DebugClients.Python.eric4dbgstub" ref="eric5.DebugClients.Python.eric4dbgstub.html" /> + <section title="eric5.DebugClients.Python.eric5dbgstub" ref="eric5.DebugClients.Python.eric5dbgstub.html" /> <section title="eric5.DebugClients.Python.getpass" ref="eric5.DebugClients.Python.getpass.html" /> </section> <section title="eric5.DebugClients.Python3" ref="index-eric5.DebugClients.Python3.html"> @@ -52,7 +52,7 @@ <section title="eric5.DebugClients.Python3.DebugThread" ref="eric5.DebugClients.Python3.DebugThread.html" /> <section title="eric5.DebugClients.Python3.FlexCompleter" ref="eric5.DebugClients.Python3.FlexCompleter.html" /> <section title="eric5.DebugClients.Python3.PyProfile" ref="eric5.DebugClients.Python3.PyProfile.html" /> - <section title="eric5.DebugClients.Python3.eric4dbgstub" ref="eric5.DebugClients.Python3.eric4dbgstub.html" /> + <section title="eric5.DebugClients.Python3.eric5dbgstub" ref="eric5.DebugClients.Python3.eric5dbgstub.html" /> <section title="eric5.DebugClients.Python3.getpass" ref="eric5.DebugClients.Python3.getpass.html" /> </section> <section title="eric5.DebugClients.Ruby" ref="index-eric5.DebugClients.Ruby.html"> @@ -1963,7 +1963,6 @@ <keyword name="VariablesViewer.__showContextMenu" id="VariablesViewer.__showContextMenu" ref="eric5.Debugger.VariablesViewer.html#VariablesViewer.__showContextMenu" /> <keyword name="VariablesViewer.__showDetails" id="VariablesViewer.__showDetails" ref="eric5.Debugger.VariablesViewer.html#VariablesViewer.__showDetails" /> <keyword name="VariablesViewer.__showVariableDetails" id="VariablesViewer.__showVariableDetails" ref="eric5.Debugger.VariablesViewer.html#VariablesViewer.__showVariableDetails" /> - <keyword name="VariablesViewer.__unicode" id="VariablesViewer.__unicode" ref="eric5.Debugger.VariablesViewer.html#VariablesViewer.__unicode" /> <keyword name="VariablesViewer.collapseItem" id="VariablesViewer.collapseItem" ref="eric5.Debugger.VariablesViewer.html#VariablesViewer.collapseItem" /> <keyword name="VariablesViewer.expandItem" id="VariablesViewer.expandItem" ref="eric5.Debugger.VariablesViewer.html#VariablesViewer.expandItem" /> <keyword name="VariablesViewer.handleResetUI" id="VariablesViewer.handleResetUI" ref="eric5.Debugger.VariablesViewer.html#VariablesViewer.handleResetUI" /> @@ -2049,14 +2048,11 @@ <keyword name="TemplatePropertiesDialog.on_helpButton_clicked" id="TemplatePropertiesDialog.on_helpButton_clicked" ref="eric5.Templates.TemplatePropertiesDialog.html#TemplatePropertiesDialog.on_helpButton_clicked" /> <keyword name="TemplatePropertiesDialog.setSelectedGroup" id="TemplatePropertiesDialog.setSelectedGroup" ref="eric5.Templates.TemplatePropertiesDialog.html#TemplatePropertiesDialog.setSelectedGroup" /> <keyword name="Utilities (Package)" id="Utilities (Package)" ref="index-eric5.Utilities.html" /> - <keyword name="CodingError" id="CodingError" ref="eric5.Utilities.__init__.html#CodingError" /> <keyword name="_percentReplacementFunc" id="_percentReplacementFunc" ref="eric5.Utilities.__init__.html#_percentReplacementFunc" /> <keyword name="compactPath" id="compactPath" ref="eric5.Utilities.__init__.html#compactPath" /> <keyword name="compile" id="compile" ref="eric5.Utilities.__init__.html#compile" /> <keyword name="convertLineEnds" id="convertLineEnds" ref="eric5.Utilities.__init__.html#convertLineEnds" /> - <keyword name="decode" id="decode" ref="eric5.Utilities.__init__.html#decode" /> <keyword name="direntries" id="direntries" ref="eric5.Utilities.__init__.html#direntries" /> - <keyword name="encode" id="encode" ref="eric5.Utilities.__init__.html#encode" /> <keyword name="escape_entities" id="escape_entities" ref="eric5.Utilities.__init__.html#escape_entities" /> <keyword name="escape_uentities" id="escape_uentities" ref="eric5.Utilities.__init__.html#escape_uentities" /> <keyword name="fromNativeSeparators" id="fromNativeSeparators" ref="eric5.Utilities.__init__.html#fromNativeSeparators" /> @@ -2076,7 +2072,6 @@ <keyword name="getPythonVersion" id="getPythonVersion" ref="eric5.Utilities.__init__.html#getPythonVersion" /> <keyword name="getTestFileName" id="getTestFileName" ref="eric5.Utilities.__init__.html#getTestFileName" /> <keyword name="getUserName" id="getUserName" ref="eric5.Utilities.__init__.html#getUserName" /> - <keyword name="get_coding" id="get_coding" ref="eric5.Utilities.__init__.html#get_coding" /> <keyword name="hasEnvironmentEntry" id="hasEnvironmentEntry" ref="eric5.Utilities.__init__.html#hasEnvironmentEntry" /> <keyword name="html_encode" id="html_encode" ref="eric5.Utilities.__init__.html#html_encode" /> <keyword name="html_uencode" id="html_uencode" ref="eric5.Utilities.__init__.html#html_uencode" /> @@ -2101,12 +2096,8 @@ <keyword name="setConfigDir" id="setConfigDir" ref="eric5.Utilities.__init__.html#setConfigDir" /> <keyword name="splitPath" id="splitPath" ref="eric5.Utilities.__init__.html#splitPath" /> <keyword name="toNativeSeparators" id="toNativeSeparators" ref="eric5.Utilities.__init__.html#toNativeSeparators" /> - <keyword name="toUnicode" id="toUnicode" ref="eric5.Utilities.__init__.html#toUnicode" /> <keyword name="win32_GetUserName" id="win32_GetUserName" ref="eric5.Utilities.__init__.html#win32_GetUserName" /> <keyword name="win32_Kill" id="win32_Kill" ref="eric5.Utilities.__init__.html#win32_Kill" /> - <keyword name="CodingError (Constructor)" id="CodingError (Constructor)" ref="eric5.Utilities.__init__.html#CodingError.__init__" /> - <keyword name="CodingError.__repr__" id="CodingError.__repr__" ref="eric5.Utilities.__init__.html#CodingError.__repr__" /> - <keyword name="CodingError.__str__" id="CodingError.__str__" ref="eric5.Utilities.__init__.html#CodingError.__str__" /> <keyword name="Startup (Module)" id="Startup (Module)" ref="eric5.Utilities.Startup.html" /> <keyword name="handleArgs" id="handleArgs" ref="eric5.Utilities.Startup.html#handleArgs" /> <keyword name="initializeResourceSearchPath" id="initializeResourceSearchPath" ref="eric5.Utilities.Startup.html#initializeResourceSearchPath" /> @@ -5125,6 +5116,7 @@ <keyword name="QSCINTILLA_VERSION" id="QSCINTILLA_VERSION" ref="eric5.QScintilla.QsciScintillaCompat.html#QSCINTILLA_VERSION" /> <keyword name="QsciScintillaCompat (Constructor)" id="QsciScintillaCompat (Constructor)" ref="eric5.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.__init__" /> <keyword name="QsciScintillaCompat.__doSearchTarget" id="QsciScintillaCompat.__doSearchTarget" ref="eric5.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.__doSearchTarget" /> + <keyword name="QsciScintillaCompat.byteAt" id="QsciScintillaCompat.byteAt" ref="eric5.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.byteAt" /> <keyword name="QsciScintillaCompat.charAt" id="QsciScintillaCompat.charAt" ref="eric5.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.charAt" /> <keyword name="QsciScintillaCompat.clearAllIndicators" id="QsciScintillaCompat.clearAllIndicators" ref="eric5.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.clearAllIndicators" /> <keyword name="QsciScintillaCompat.clearAlternateKeys" id="QsciScintillaCompat.clearAlternateKeys" ref="eric5.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.clearAlternateKeys" /> @@ -5178,7 +5170,6 @@ <keyword name="QsciScintillaCompat.positionBefore" id="QsciScintillaCompat.positionBefore" ref="eric5.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.positionBefore" /> <keyword name="QsciScintillaCompat.positionFromLineIndex" id="QsciScintillaCompat.positionFromLineIndex" ref="eric5.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.positionFromLineIndex" /> <keyword name="QsciScintillaCompat.positionFromPoint" id="QsciScintillaCompat.positionFromPoint" ref="eric5.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.positionFromPoint" /> - <keyword name="QsciScintillaCompat.rawCharAt" id="QsciScintillaCompat.rawCharAt" ref="eric5.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.rawCharAt" /> <keyword name="QsciScintillaCompat.replaceTarget" id="QsciScintillaCompat.replaceTarget" ref="eric5.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.replaceTarget" /> <keyword name="QsciScintillaCompat.scrollVertical" id="QsciScintillaCompat.scrollVertical" ref="eric5.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.scrollVertical" /> <keyword name="QsciScintillaCompat.setCurrentIndicator" id="QsciScintillaCompat.setCurrentIndicator" ref="eric5.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.setCurrentIndicator" /> @@ -5996,11 +5987,6 @@ <keyword name="Completer.attr_matches" id="Completer.attr_matches" ref="eric5.DebugClients.Python.FlexCompleter.html#Completer.attr_matches" /> <keyword name="Completer.complete" id="Completer.complete" ref="eric5.DebugClients.Python.FlexCompleter.html#Completer.complete" /> <keyword name="Completer.global_matches" id="Completer.global_matches" ref="eric5.DebugClients.Python.FlexCompleter.html#Completer.global_matches" /> - <keyword name="eric4dbgstub (Module)" id="eric4dbgstub (Module)" ref="eric5.DebugClients.Python.eric4dbgstub.html" /> - <keyword name="initDebugger" id="initDebugger" ref="eric5.DebugClients.Python.eric4dbgstub.html#initDebugger" /> - <keyword name="runcall" id="runcall" ref="eric5.DebugClients.Python.eric4dbgstub.html#runcall" /> - <keyword name="setScriptname" id="setScriptname" ref="eric5.DebugClients.Python.eric4dbgstub.html#setScriptname" /> - <keyword name="startDebugger" id="startDebugger" ref="eric5.DebugClients.Python.eric4dbgstub.html#startDebugger" /> <keyword name="AsyncIO (Module)" id="AsyncIO (Module)" ref="eric5.DebugClients.Python.AsyncIO.html" /> <keyword name="AsyncIO" id="AsyncIO" ref="eric5.DebugClients.Python.AsyncIO.html#AsyncIO" /> <keyword name="AsyncIO (Constructor)" id="AsyncIO (Constructor)" ref="eric5.DebugClients.Python.AsyncIO.html#AsyncIO.__init__" /> @@ -6098,6 +6084,11 @@ <keyword name="DebugClientThreads.set_quit" id="DebugClientThreads.set_quit" ref="eric5.DebugClients.Python.DebugClientThreads.html#DebugClientThreads.set_quit" /> <keyword name="DebugClientThreads.threadTerminated" id="DebugClientThreads.threadTerminated" ref="eric5.DebugClients.Python.DebugClientThreads.html#DebugClientThreads.threadTerminated" /> <keyword name="DebugClientThreads.unlockClient" id="DebugClientThreads.unlockClient" ref="eric5.DebugClients.Python.DebugClientThreads.html#DebugClientThreads.unlockClient" /> + <keyword name="eric5dbgstub (Module)" id="eric5dbgstub (Module)" ref="eric5.DebugClients.Python.eric5dbgstub.html" /> + <keyword name="initDebugger" id="initDebugger" ref="eric5.DebugClients.Python.eric5dbgstub.html#initDebugger" /> + <keyword name="runcall" id="runcall" ref="eric5.DebugClients.Python.eric5dbgstub.html#runcall" /> + <keyword name="setScriptname" id="setScriptname" ref="eric5.DebugClients.Python.eric5dbgstub.html#setScriptname" /> + <keyword name="startDebugger" id="startDebugger" ref="eric5.DebugClients.Python.eric5dbgstub.html#startDebugger" /> <keyword name="DebugClientBase (Module)" id="DebugClientBase (Module)" ref="eric5.DebugClients.Python.DebugClientBase.html" /> <keyword name="DebugClientBase" id="DebugClientBase" ref="eric5.DebugClients.Python.DebugClientBase.html#DebugClientBase" /> <keyword name="DebugClientClose" id="DebugClientClose" ref="eric5.DebugClients.Python.DebugClientBase.html#DebugClientClose" /> @@ -6162,11 +6153,6 @@ <keyword name="Completer.attr_matches" id="Completer.attr_matches" ref="eric5.DebugClients.Python3.FlexCompleter.html#Completer.attr_matches" /> <keyword name="Completer.complete" id="Completer.complete" ref="eric5.DebugClients.Python3.FlexCompleter.html#Completer.complete" /> <keyword name="Completer.global_matches" id="Completer.global_matches" ref="eric5.DebugClients.Python3.FlexCompleter.html#Completer.global_matches" /> - <keyword name="eric4dbgstub (Module)" id="eric4dbgstub (Module)" ref="eric5.DebugClients.Python3.eric4dbgstub.html" /> - <keyword name="initDebugger" id="initDebugger" ref="eric5.DebugClients.Python3.eric4dbgstub.html#initDebugger" /> - <keyword name="runcall" id="runcall" ref="eric5.DebugClients.Python3.eric4dbgstub.html#runcall" /> - <keyword name="setScriptname" id="setScriptname" ref="eric5.DebugClients.Python3.eric4dbgstub.html#setScriptname" /> - <keyword name="startDebugger" id="startDebugger" ref="eric5.DebugClients.Python3.eric4dbgstub.html#startDebugger" /> <keyword name="AsyncIO (Module)" id="AsyncIO (Module)" ref="eric5.DebugClients.Python3.AsyncIO.html" /> <keyword name="AsyncIO" id="AsyncIO" ref="eric5.DebugClients.Python3.AsyncIO.html#AsyncIO" /> <keyword name="AsyncIO (Constructor)" id="AsyncIO (Constructor)" ref="eric5.DebugClients.Python3.AsyncIO.html#AsyncIO.__init__" /> @@ -6265,6 +6251,11 @@ <keyword name="DebugClientThreads.set_quit" id="DebugClientThreads.set_quit" ref="eric5.DebugClients.Python3.DebugClientThreads.html#DebugClientThreads.set_quit" /> <keyword name="DebugClientThreads.threadTerminated" id="DebugClientThreads.threadTerminated" ref="eric5.DebugClients.Python3.DebugClientThreads.html#DebugClientThreads.threadTerminated" /> <keyword name="DebugClientThreads.unlockClient" id="DebugClientThreads.unlockClient" ref="eric5.DebugClients.Python3.DebugClientThreads.html#DebugClientThreads.unlockClient" /> + <keyword name="eric5dbgstub (Module)" id="eric5dbgstub (Module)" ref="eric5.DebugClients.Python3.eric5dbgstub.html" /> + <keyword name="initDebugger" id="initDebugger" ref="eric5.DebugClients.Python3.eric5dbgstub.html#initDebugger" /> + <keyword name="runcall" id="runcall" ref="eric5.DebugClients.Python3.eric5dbgstub.html#runcall" /> + <keyword name="setScriptname" id="setScriptname" ref="eric5.DebugClients.Python3.eric5dbgstub.html#setScriptname" /> + <keyword name="startDebugger" id="startDebugger" ref="eric5.DebugClients.Python3.eric5dbgstub.html#startDebugger" /> <keyword name="DebugClientBase (Module)" id="DebugClientBase (Module)" ref="eric5.DebugClients.Python3.DebugClientBase.html" /> <keyword name="DebugClientBase" id="DebugClientBase" ref="eric5.DebugClients.Python3.DebugClientBase.html#DebugClientBase" /> <keyword name="DebugClientClose" id="DebugClientClose" ref="eric5.DebugClients.Python3.DebugClientBase.html#DebugClientClose" /> @@ -8854,6 +8845,7 @@ <file>eric5.DebugClients.Python.FlexCompleter.html</file> <file>eric5.DebugClients.Python.PyProfile.html</file> <file>eric5.DebugClients.Python.eric4dbgstub.html</file> + <file>eric5.DebugClients.Python.eric5dbgstub.html</file> <file>eric5.DebugClients.Python.getpass.html</file> <file>eric5.DebugClients.Python3.AsyncFile.html</file> <file>eric5.DebugClients.Python3.AsyncIO.html</file> @@ -8869,6 +8861,7 @@ <file>eric5.DebugClients.Python3.FlexCompleter.html</file> <file>eric5.DebugClients.Python3.PyProfile.html</file> <file>eric5.DebugClients.Python3.eric4dbgstub.html</file> + <file>eric5.DebugClients.Python3.eric5dbgstub.html</file> <file>eric5.DebugClients.Python3.getpass.html</file> <file>eric5.DebugClients.Ruby.AsyncFile.html</file> <file>eric5.DebugClients.Ruby.AsyncIO.html</file>
--- a/Documentation/Source/eric5.DebugClients.Python.eric4dbgstub.html Fri Jan 08 17:04:18 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,126 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' -'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'> -<html><head> -<title>eric5.DebugClients.Python.eric4dbgstub</title> -<style> -body { - background:white; - margin: 0em 1em 10em 1em; - color: black; -} - -h1 { color: white; background: #4FA4FF; } -h2 { color: white; background: #4FA4FF; } -h3 { color: white; background: #00557F; } -h4 { color: white; background: #00557F; } - -a { color: #AA5500; } - -</style> -</head> -<body><a NAME="top" ID="top"></a> -<h1>eric5.DebugClients.Python.eric4dbgstub</h1> -<p> -Module implementing a debugger stub for remote debugging. -</p> -<h3>Global Attributes</h3> -<table> -<tr><td>__scriptname</td></tr><tr><td>debugger</td></tr><tr><td>ericpath</td></tr><tr><td>modDir</td></tr> -</table> -<h3>Classes</h3> -<table> -<tr><td>None</td></tr> -</table> -<h3>Functions</h3> -<table> -<tr> -<td><a href="#initDebugger">initDebugger</a></td> -<td>Module function to initialize a debugger for remote debugging.</td> -</tr><tr> -<td><a href="#runcall">runcall</a></td> -<td>Module function mimicing the Pdb interface.</td> -</tr><tr> -<td><a href="#setScriptname">setScriptname</a></td> -<td>Module function to set the scriptname to be reported back to the IDE.</td> -</tr><tr> -<td><a href="#startDebugger">startDebugger</a></td> -<td>Module function used to start the remote debugger.</td> -</tr> -</table> -<hr /><hr /> -<a NAME="initDebugger" ID="initDebugger"></a> -<h2>initDebugger</h2> -<b>initDebugger</b>(<i>kind = "standard"</i>) -<p> - Module function to initialize a debugger for remote debugging. -</p><dl> -<dt><i>kind</i></dt> -<dd> -type of debugger ("standard" or "threads") -</dd> -</dl><dl> -<dt>Returns:</dt> -<dd> -flag indicating success (boolean) -</dd> -</dl> -<div align="right"><a href="#top">Up</a></div> -<hr /><hr /> -<a NAME="runcall" ID="runcall"></a> -<h2>runcall</h2> -<b>runcall</b>(<i>func, *args</i>) -<p> - Module function mimicing the Pdb interface. -</p><dl> -<dt><i>func</i></dt> -<dd> -function to be called (function object) -</dd><dt><i>*args</i></dt> -<dd> -arguments being passed to func -</dd> -</dl><dl> -<dt>Returns:</dt> -<dd> -the function result -</dd> -</dl> -<div align="right"><a href="#top">Up</a></div> -<hr /><hr /> -<a NAME="setScriptname" ID="setScriptname"></a> -<h2>setScriptname</h2> -<b>setScriptname</b>(<i>name</i>) -<p> - Module function to set the scriptname to be reported back to the IDE. -</p><dl> -<dt><i>name</i></dt> -<dd> -absolute pathname of the script (string) -</dd> -</dl> -<div align="right"><a href="#top">Up</a></div> -<hr /><hr /> -<a NAME="startDebugger" ID="startDebugger"></a> -<h2>startDebugger</h2> -<b>startDebugger</b>(<i>enableTrace = True, exceptions = True, tracePython = False, redirect = True</i>) -<p> - Module function used to start the remote debugger. -</p><dl> -<dt><i>enableTrace=</i></dt> -<dd> -flag to enable the tracing function (boolean) -</dd><dt><i>exceptions=</i></dt> -<dd> -flag to enable exception reporting of the IDE (boolean) -</dd><dt><i>tracePython=</i></dt> -<dd> -flag to enable tracing into the Python library (boolean) -</dd><dt><i>redirect=</i></dt> -<dd> -flag indicating redirection of stdin, stdout and stderr (boolean) -</dd> -</dl> -<div align="right"><a href="#top">Up</a></div> -<hr /> -</body></html> \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Documentation/Source/eric5.DebugClients.Python.eric5dbgstub.html Fri Jan 08 19:14:19 2010 +0000 @@ -0,0 +1,126 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' +'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'> +<html><head> +<title>eric5.DebugClients.Python.eric5dbgstub</title> +<style> +body { + background:white; + margin: 0em 1em 10em 1em; + color: black; +} + +h1 { color: white; background: #4FA4FF; } +h2 { color: white; background: #4FA4FF; } +h3 { color: white; background: #00557F; } +h4 { color: white; background: #00557F; } + +a { color: #AA5500; } + +</style> +</head> +<body><a NAME="top" ID="top"></a> +<h1>eric5.DebugClients.Python.eric5dbgstub</h1> +<p> +Module implementing a debugger stub for remote debugging. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>__scriptname</td></tr><tr><td>debugger</td></tr><tr><td>ericpath</td></tr><tr><td>modDir</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Functions</h3> +<table> +<tr> +<td><a href="#initDebugger">initDebugger</a></td> +<td>Module function to initialize a debugger for remote debugging.</td> +</tr><tr> +<td><a href="#runcall">runcall</a></td> +<td>Module function mimicing the Pdb interface.</td> +</tr><tr> +<td><a href="#setScriptname">setScriptname</a></td> +<td>Module function to set the scriptname to be reported back to the IDE.</td> +</tr><tr> +<td><a href="#startDebugger">startDebugger</a></td> +<td>Module function used to start the remote debugger.</td> +</tr> +</table> +<hr /><hr /> +<a NAME="initDebugger" ID="initDebugger"></a> +<h2>initDebugger</h2> +<b>initDebugger</b>(<i>kind = "standard"</i>) +<p> + Module function to initialize a debugger for remote debugging. +</p><dl> +<dt><i>kind</i></dt> +<dd> +type of debugger ("standard" or "threads") +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +flag indicating success (boolean) +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> +<a NAME="runcall" ID="runcall"></a> +<h2>runcall</h2> +<b>runcall</b>(<i>func, *args</i>) +<p> + Module function mimicing the Pdb interface. +</p><dl> +<dt><i>func</i></dt> +<dd> +function to be called (function object) +</dd><dt><i>*args</i></dt> +<dd> +arguments being passed to func +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +the function result +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> +<a NAME="setScriptname" ID="setScriptname"></a> +<h2>setScriptname</h2> +<b>setScriptname</b>(<i>name</i>) +<p> + Module function to set the scriptname to be reported back to the IDE. +</p><dl> +<dt><i>name</i></dt> +<dd> +absolute pathname of the script (string) +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> +<a NAME="startDebugger" ID="startDebugger"></a> +<h2>startDebugger</h2> +<b>startDebugger</b>(<i>enableTrace = True, exceptions = True, tracePython = False, redirect = True</i>) +<p> + Module function used to start the remote debugger. +</p><dl> +<dt><i>enableTrace=</i></dt> +<dd> +flag to enable the tracing function (boolean) +</dd><dt><i>exceptions=</i></dt> +<dd> +flag to enable exception reporting of the IDE (boolean) +</dd><dt><i>tracePython=</i></dt> +<dd> +flag to enable tracing into the Python library (boolean) +</dd><dt><i>redirect=</i></dt> +<dd> +flag indicating redirection of stdin, stdout and stderr (boolean) +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /> +</body></html> \ No newline at end of file
--- a/Documentation/Source/eric5.DebugClients.Python3.DebugClientBase.html Fri Jan 08 17:04:18 2010 +0000 +++ b/Documentation/Source/eric5.DebugClients.Python3.DebugClientBase.html Fri Jan 08 19:14:19 2010 +0000 @@ -540,16 +540,13 @@ </dd> </dl><a NAME="DebugClientBase.input" ID="DebugClientBase.input"></a> <h4>DebugClientBase.input</h4> -<b>input</b>(<i>prompt, echo</i>) +<b>input</b>(<i>prompt</i>) <p> Public method to implement input() using the event loop. </p><dl> <dt><i>prompt</i></dt> <dd> the prompt to be shown (string) -</dd><dt><i>echo</i></dt> -<dd> -Flag indicating echoing of the input (boolean) </dd> </dl><dl> <dt>Returns:</dt>
--- a/Documentation/Source/eric5.DebugClients.Python3.eric4dbgstub.html Fri Jan 08 17:04:18 2010 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,126 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' -'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'> -<html><head> -<title>eric5.DebugClients.Python3.eric4dbgstub</title> -<style> -body { - background:white; - margin: 0em 1em 10em 1em; - color: black; -} - -h1 { color: white; background: #4FA4FF; } -h2 { color: white; background: #4FA4FF; } -h3 { color: white; background: #00557F; } -h4 { color: white; background: #00557F; } - -a { color: #AA5500; } - -</style> -</head> -<body><a NAME="top" ID="top"></a> -<h1>eric5.DebugClients.Python3.eric4dbgstub</h1> -<p> -Module implementing a debugger stub for remote debugging. -</p> -<h3>Global Attributes</h3> -<table> -<tr><td>__scriptname</td></tr><tr><td>debugger</td></tr><tr><td>ericpath</td></tr><tr><td>modDir</td></tr> -</table> -<h3>Classes</h3> -<table> -<tr><td>None</td></tr> -</table> -<h3>Functions</h3> -<table> -<tr> -<td><a href="#initDebugger">initDebugger</a></td> -<td>Module function to initialize a debugger for remote debugging.</td> -</tr><tr> -<td><a href="#runcall">runcall</a></td> -<td>Module function mimicing the Pdb interface.</td> -</tr><tr> -<td><a href="#setScriptname">setScriptname</a></td> -<td>Module function to set the scriptname to be reported back to the IDE.</td> -</tr><tr> -<td><a href="#startDebugger">startDebugger</a></td> -<td>Module function used to start the remote debugger.</td> -</tr> -</table> -<hr /><hr /> -<a NAME="initDebugger" ID="initDebugger"></a> -<h2>initDebugger</h2> -<b>initDebugger</b>(<i>kind = "standard"</i>) -<p> - Module function to initialize a debugger for remote debugging. -</p><dl> -<dt><i>kind</i></dt> -<dd> -type of debugger ("standard" or "threads") -</dd> -</dl><dl> -<dt>Returns:</dt> -<dd> -flag indicating success (boolean) -</dd> -</dl> -<div align="right"><a href="#top">Up</a></div> -<hr /><hr /> -<a NAME="runcall" ID="runcall"></a> -<h2>runcall</h2> -<b>runcall</b>(<i>func, *args</i>) -<p> - Module function mimicing the Pdb interface. -</p><dl> -<dt><i>func</i></dt> -<dd> -function to be called (function object) -</dd><dt><i>*args</i></dt> -<dd> -arguments being passed to func -</dd> -</dl><dl> -<dt>Returns:</dt> -<dd> -the function result -</dd> -</dl> -<div align="right"><a href="#top">Up</a></div> -<hr /><hr /> -<a NAME="setScriptname" ID="setScriptname"></a> -<h2>setScriptname</h2> -<b>setScriptname</b>(<i>name</i>) -<p> - Module function to set the scriptname to be reported back to the IDE. -</p><dl> -<dt><i>name</i></dt> -<dd> -absolute pathname of the script (string) -</dd> -</dl> -<div align="right"><a href="#top">Up</a></div> -<hr /><hr /> -<a NAME="startDebugger" ID="startDebugger"></a> -<h2>startDebugger</h2> -<b>startDebugger</b>(<i>enableTrace = True, exceptions = True, tracePython = False, redirect = True</i>) -<p> - Module function used to start the remote debugger. -</p><dl> -<dt><i>enableTrace=</i></dt> -<dd> -flag to enable the tracing function (boolean) -</dd><dt><i>exceptions=</i></dt> -<dd> -flag to enable exception reporting of the IDE (boolean) -</dd><dt><i>tracePython=</i></dt> -<dd> -flag to enable tracing into the Python library (boolean) -</dd><dt><i>redirect=</i></dt> -<dd> -flag indicating redirection of stdin, stdout and stderr (boolean) -</dd> -</dl> -<div align="right"><a href="#top">Up</a></div> -<hr /> -</body></html> \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Documentation/Source/eric5.DebugClients.Python3.eric5dbgstub.html Fri Jan 08 19:14:19 2010 +0000 @@ -0,0 +1,126 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' +'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'> +<html><head> +<title>eric5.DebugClients.Python3.eric5dbgstub</title> +<style> +body { + background:white; + margin: 0em 1em 10em 1em; + color: black; +} + +h1 { color: white; background: #4FA4FF; } +h2 { color: white; background: #4FA4FF; } +h3 { color: white; background: #00557F; } +h4 { color: white; background: #00557F; } + +a { color: #AA5500; } + +</style> +</head> +<body><a NAME="top" ID="top"></a> +<h1>eric5.DebugClients.Python3.eric5dbgstub</h1> +<p> +Module implementing a debugger stub for remote debugging. +</p> +<h3>Global Attributes</h3> +<table> +<tr><td>__scriptname</td></tr><tr><td>debugger</td></tr><tr><td>ericpath</td></tr><tr><td>modDir</td></tr> +</table> +<h3>Classes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Functions</h3> +<table> +<tr> +<td><a href="#initDebugger">initDebugger</a></td> +<td>Module function to initialize a debugger for remote debugging.</td> +</tr><tr> +<td><a href="#runcall">runcall</a></td> +<td>Module function mimicing the Pdb interface.</td> +</tr><tr> +<td><a href="#setScriptname">setScriptname</a></td> +<td>Module function to set the scriptname to be reported back to the IDE.</td> +</tr><tr> +<td><a href="#startDebugger">startDebugger</a></td> +<td>Module function used to start the remote debugger.</td> +</tr> +</table> +<hr /><hr /> +<a NAME="initDebugger" ID="initDebugger"></a> +<h2>initDebugger</h2> +<b>initDebugger</b>(<i>kind = "standard"</i>) +<p> + Module function to initialize a debugger for remote debugging. +</p><dl> +<dt><i>kind</i></dt> +<dd> +type of debugger ("standard" or "threads") +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +flag indicating success (boolean) +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> +<a NAME="runcall" ID="runcall"></a> +<h2>runcall</h2> +<b>runcall</b>(<i>func, *args</i>) +<p> + Module function mimicing the Pdb interface. +</p><dl> +<dt><i>func</i></dt> +<dd> +function to be called (function object) +</dd><dt><i>*args</i></dt> +<dd> +arguments being passed to func +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +the function result +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> +<a NAME="setScriptname" ID="setScriptname"></a> +<h2>setScriptname</h2> +<b>setScriptname</b>(<i>name</i>) +<p> + Module function to set the scriptname to be reported back to the IDE. +</p><dl> +<dt><i>name</i></dt> +<dd> +absolute pathname of the script (string) +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> +<a NAME="startDebugger" ID="startDebugger"></a> +<h2>startDebugger</h2> +<b>startDebugger</b>(<i>enableTrace = True, exceptions = True, tracePython = False, redirect = True</i>) +<p> + Module function used to start the remote debugger. +</p><dl> +<dt><i>enableTrace=</i></dt> +<dd> +flag to enable the tracing function (boolean) +</dd><dt><i>exceptions=</i></dt> +<dd> +flag to enable exception reporting of the IDE (boolean) +</dd><dt><i>tracePython=</i></dt> +<dd> +flag to enable tracing into the Python library (boolean) +</dd><dt><i>redirect=</i></dt> +<dd> +flag indicating redirection of stdin, stdout and stderr (boolean) +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /> +</body></html> \ No newline at end of file
--- a/Documentation/Source/eric5.Debugger.VariablesViewer.html Fri Jan 08 17:04:18 2010 +0000 +++ b/Documentation/Source/eric5.Debugger.VariablesViewer.html Fri Jan 08 19:14:19 2010 +0000 @@ -433,9 +433,6 @@ <td><a href="#VariablesViewer.__showVariableDetails">__showVariableDetails</a></td> <td>Private method to show details about a variable.</td> </tr><tr> -<td><a href="#VariablesViewer.__unicode">__unicode</a></td> -<td>Private method to convert a string to unicode.</td> -</tr><tr> <td><a href="#VariablesViewer.collapseItem">collapseItem</a></td> <td>Public slot to handle the collapsed signal.</td> </tr><tr> @@ -630,21 +627,6 @@ <dd> reference to the variable item </dd> -</dl><a NAME="VariablesViewer.__unicode" ID="VariablesViewer.__unicode"></a> -<h4>VariablesViewer.__unicode</h4> -<b>__unicode</b>(<i>s</i>) -<p> - Private method to convert a string to unicode. -</p><dl> -<dt><i>s</i></dt> -<dd> -the string to be converted (string) -</dd> -</dl><dl> -<dt>Returns:</dt> -<dd> -unicode representation of s (unicode object) -</dd> </dl><a NAME="VariablesViewer.collapseItem" ID="VariablesViewer.collapseItem"></a> <h4>VariablesViewer.collapseItem</h4> <b>collapseItem</b>(<i>parentItem</i>)
--- a/Documentation/Source/eric5.QScintilla.QsciScintillaCompat.html Fri Jan 08 17:04:18 2010 +0000 +++ b/Documentation/Source/eric5.QScintilla.QsciScintillaCompat.html Fri Jan 08 19:14:19 2010 +0000 @@ -67,6 +67,9 @@ <td><a href="#QsciScintillaCompat.__doSearchTarget">__doSearchTarget</a></td> <td>Private method to perform the search in target.</td> </tr><tr> +<td><a href="#QsciScintillaCompat.byteAt">byteAt</a></td> +<td>Public method to get the raw character (bytes) at a position in the text.</td> +</tr><tr> <td><a href="#QsciScintillaCompat.charAt">charAt</a></td> <td>Public method to get the character at a position in the text observing multibyte characters.</td> </tr><tr> @@ -226,9 +229,6 @@ <td><a href="#QsciScintillaCompat.positionFromPoint">positionFromPoint</a></td> <td>Public method to calculate the scintilla position from a point in the window.</td> </tr><tr> -<td><a href="#QsciScintillaCompat.rawCharAt">rawCharAt</a></td> -<td>Public method to get the raw character at a position in the text.</td> -</tr><tr> <td><a href="#QsciScintillaCompat.replaceTarget">replaceTarget</a></td> <td>Public method to replace the string found by the last search in target.</td> </tr><tr> @@ -301,6 +301,22 @@ <dd> flag indicating a successful search (boolean) </dd> +</dl><a NAME="QsciScintillaCompat.byteAt" ID="QsciScintillaCompat.byteAt"></a> +<h4>QsciScintillaCompat.byteAt</h4> +<b>byteAt</b>(<i>pos</i>) +<p> + Public method to get the raw character (bytes) at a position in the text. +</p><dl> +<dt><i>pos</i></dt> +<dd> +position in the text (integer) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +raw character at the requested position or empty bytes, if the position + is negative or past the end of the document (bytes) +</dd> </dl><a NAME="QsciScintillaCompat.charAt" ID="QsciScintillaCompat.charAt"></a> <h4>QsciScintillaCompat.charAt</h4> <b>charAt</b>(<i>pos</i>) @@ -315,7 +331,7 @@ </dl><dl> <dt>Returns:</dt> <dd> -raw character at the requested position or empty string, if the position +character at the requested position or empty string, if the position is negative or past the end of the document (string) </dd> </dl><a NAME="QsciScintillaCompat.clearAllIndicators" ID="QsciScintillaCompat.clearAllIndicators"></a> @@ -880,22 +896,6 @@ scintilla position (integer) or -1 to indicate, that the point is not near any character </dd> -</dl><a NAME="QsciScintillaCompat.rawCharAt" ID="QsciScintillaCompat.rawCharAt"></a> -<h4>QsciScintillaCompat.rawCharAt</h4> -<b>rawCharAt</b>(<i>pos</i>) -<p> - Public method to get the raw character at a position in the text. -</p><dl> -<dt><i>pos</i></dt> -<dd> -position in the text (integer) -</dd> -</dl><dl> -<dt>Returns:</dt> -<dd> -raw character at the requested position or empty string, if the position - is negative or past the end of the document (string) -</dd> </dl><a NAME="QsciScintillaCompat.replaceTarget" ID="QsciScintillaCompat.replaceTarget"></a> <h4>QsciScintillaCompat.replaceTarget</h4> <b>replaceTarget</b>(<i>replaceStr</i>)
--- a/Documentation/Source/eric5.Utilities.__init__.html Fri Jan 08 17:04:18 2010 +0000 +++ b/Documentation/Source/eric5.Utilities.__init__.html Fri Jan 08 19:14:19 2010 +0000 @@ -26,14 +26,11 @@ </p> <h3>Global Attributes</h3> <table> -<tr><td>_escape</td></tr><tr><td>_escape_map</td></tr><tr><td>_uescape</td></tr><tr><td>coding_regexps</td></tr><tr><td>configDir</td></tr><tr><td>supportedCodecs</td></tr> +<tr><td>_escape</td></tr><tr><td>_escape_map</td></tr><tr><td>_uescape</td></tr><tr><td>configDir</td></tr><tr><td>supportedCodecs</td></tr> </table> <h3>Classes</h3> <table> -<tr> -<td><a href="#CodingError">CodingError</a></td> -<td>Class implementing an exception, which is raised, if a given coding is incorrect.</td> -</tr> +<tr><td>None</td></tr> </table> <h3>Functions</h3> <table> @@ -50,15 +47,9 @@ <td><a href="#convertLineEnds">convertLineEnds</a></td> <td>Function to convert the end of line characters.</td> </tr><tr> -<td><a href="#decode">decode</a></td> -<td>Function to decode a text.</td> -</tr><tr> <td><a href="#direntries">direntries</a></td> <td>Function returning a list of all files and directories.</td> </tr><tr> -<td><a href="#encode">encode</a></td> -<td>Function to encode a text.</td> -</tr><tr> <td><a href="#escape_entities">escape_entities</a></td> <td>Function to encode html entities.</td> </tr><tr> @@ -116,9 +107,6 @@ <td><a href="#getUserName">getUserName</a></td> <td>Function to get the user name.</td> </tr><tr> -<td><a href="#get_coding">get_coding</a></td> -<td>Function to get the coding of a text.</td> -</tr><tr> <td><a href="#hasEnvironmentEntry">hasEnvironmentEntry</a></td> <td>Module function to check, if the environment contains an entry.</td> </tr><tr> @@ -191,9 +179,6 @@ <td><a href="#toNativeSeparators">toNativeSeparators</a></td> <td>Function returning a path, that is using native separator characters.</td> </tr><tr> -<td><a href="#toUnicode">toUnicode</a></td> -<td>Public method to convert a string to unicode.</td> -</tr><tr> <td><a href="#win32_GetUserName">win32_GetUserName</a></td> <td>Function to get the user name under Win32.</td> </tr><tr> @@ -202,58 +187,6 @@ </tr> </table> <hr /><hr /> -<a NAME="CodingError" ID="CodingError"></a> -<h2>CodingError</h2> -<p> - Class implementing an exception, which is raised, if a given coding is incorrect. -</p> -<h3>Derived from</h3> -Exception -<h3>Class Attributes</h3> -<table> -<tr><td>None</td></tr> -</table> -<h3>Methods</h3> -<table> -<tr> -<td><a href="#CodingError.__init__">CodingError</a></td> -<td>Constructor</td> -</tr><tr> -<td><a href="#CodingError.__repr__">__repr__</a></td> -<td>Private method returning a representation of the exception.</td> -</tr><tr> -<td><a href="#CodingError.__str__">__str__</a></td> -<td>Private method returning a string representation of the exception.</td> -</tr> -</table> -<a NAME="CodingError.__init__" ID="CodingError.__init__"></a> -<h4>CodingError (Constructor)</h4> -<b>CodingError</b>(<i>coding</i>) -<p> - Constructor -</p><a NAME="CodingError.__repr__" ID="CodingError.__repr__"></a> -<h4>CodingError.__repr__</h4> -<b>__repr__</b>(<i></i>) -<p> - Private method returning a representation of the exception. -</p><dl> -<dt>Returns:</dt> -<dd> -string representing the error message -</dd> -</dl><a NAME="CodingError.__str__" ID="CodingError.__str__"></a> -<h4>CodingError.__str__</h4> -<b>__str__</b>(<i></i>) -<p> - Private method returning a string representation of the exception. -</p><dl> -<dt>Returns:</dt> -<dd> -string representing the error message -</dd> -</dl> -<div align="right"><a href="#top">Up</a></div> -<hr /><hr /> <a NAME="_percentReplacementFunc" ID="_percentReplacementFunc"></a> <h2>_percentReplacementFunc</h2> <b>_percentReplacementFunc</b>(<i>matchobj</i>) @@ -341,24 +274,6 @@ </dl> <div align="right"><a href="#top">Up</a></div> <hr /><hr /> -<a NAME="decode" ID="decode"></a> -<h2>decode</h2> -<b>decode</b>(<i>text</i>) -<p> - Function to decode a text. -</p><dl> -<dt><i>text</i></dt> -<dd> -text to decode (string) -</dd> -</dl><dl> -<dt>Returns:</dt> -<dd> -decoded text and encoding -</dd> -</dl> -<div align="right"><a href="#top">Up</a></div> -<hr /><hr /> <a NAME="direntries" ID="direntries"></a> <h2>direntries</h2> <b>direntries</b>(<i>path, filesonly=False, pattern=None, followsymlinks=True, checkStop=None</i>) @@ -391,27 +306,6 @@ </dl> <div align="right"><a href="#top">Up</a></div> <hr /><hr /> -<a NAME="encode" ID="encode"></a> -<h2>encode</h2> -<b>encode</b>(<i>text, orig_coding</i>) -<p> - Function to encode a text. -</p><dl> -<dt><i>text</i></dt> -<dd> -text to encode (string) -</dd><dt><i>orig_coding</i></dt> -<dd> -type of the original coding (string) -</dd> -</dl><dl> -<dt>Returns:</dt> -<dd> -encoded text and encoding -</dd> -</dl> -<div align="right"><a href="#top">Up</a></div> -<hr /><hr /> <a NAME="escape_entities" ID="escape_entities"></a> <h2>escape_entities</h2> <b>escape_entities</b>(<i>m, map=_escape_map</i>) @@ -735,24 +629,6 @@ </dl> <div align="right"><a href="#top">Up</a></div> <hr /><hr /> -<a NAME="get_coding" ID="get_coding"></a> -<h2>get_coding</h2> -<b>get_coding</b>(<i>text</i>) -<p> - Function to get the coding of a text. -</p><dl> -<dt><i>text</i></dt> -<dd> -text to inspect (string) -</dd> -</dl><dl> -<dt>Returns:</dt> -<dd> -coding string -</dd> -</dl> -<div align="right"><a href="#top">Up</a></div> -<hr /><hr /> <a NAME="hasEnvironmentEntry" ID="hasEnvironmentEntry"></a> <h2>hasEnvironmentEntry</h2> <b>hasEnvironmentEntry</b>(<i>key</i>) @@ -1201,27 +1077,6 @@ </dl> <div align="right"><a href="#top">Up</a></div> <hr /><hr /> -<a NAME="toUnicode" ID="toUnicode"></a> -<h2>toUnicode</h2> -<b>toUnicode</b>(<i>s</i>) -<p> - Public method to convert a string to unicode. -</p><p> - Various codes are tried until one converts the string without an error. - If all codecs fail, the string is returned unaltered. -</p><dl> -<dt><i>s</i></dt> -<dd> -string to be converted (string) -</dd> -</dl><dl> -<dt>Returns:</dt> -<dd> -converted string (unicode) -</dd> -</dl> -<div align="right"><a href="#top">Up</a></div> -<hr /><hr /> <a NAME="win32_GetUserName" ID="win32_GetUserName"></a> <h2>win32_GetUserName</h2> <b>win32_GetUserName</b>(<i></i>)
--- a/Documentation/Source/index-eric5.DebugClients.Python.html Fri Jan 08 17:04:18 2010 +0000 +++ b/Documentation/Source/index-eric5.DebugClients.Python.html Fri Jan 08 19:14:19 2010 +0000 @@ -70,7 +70,7 @@ <td><a href="eric5.DebugClients.Python.PyProfile.html">PyProfile</a></td> <td>Module defining additions to the standard Python profile.py.</td> </tr><tr> -<td><a href="eric5.DebugClients.Python.eric4dbgstub.html">eric4dbgstub</a></td> +<td><a href="eric5.DebugClients.Python.eric5dbgstub.html">eric5dbgstub</a></td> <td>Module implementing a debugger stub for remote debugging.</td> </tr><tr> <td><a href="eric5.DebugClients.Python.getpass.html">getpass</a></td>
--- a/Documentation/Source/index-eric5.DebugClients.Python3.html Fri Jan 08 17:04:18 2010 +0000 +++ b/Documentation/Source/index-eric5.DebugClients.Python3.html Fri Jan 08 19:14:19 2010 +0000 @@ -70,7 +70,7 @@ <td><a href="eric5.DebugClients.Python3.PyProfile.html">PyProfile</a></td> <td>Module defining additions to the standard Python profile.py.</td> </tr><tr> -<td><a href="eric5.DebugClients.Python3.eric4dbgstub.html">eric4dbgstub</a></td> +<td><a href="eric5.DebugClients.Python3.eric5dbgstub.html">eric5dbgstub</a></td> <td>Module implementing a debugger stub for remote debugging.</td> </tr><tr> <td><a href="eric5.DebugClients.Python3.getpass.html">getpass</a></td>
--- a/QScintilla/Shell.py Fri Jan 08 17:04:18 2010 +0000 +++ b/QScintilla/Shell.py Fri Jan 08 19:14:19 2010 +0000 @@ -21,7 +21,7 @@ import Preferences import UI.PixmapCache -from Utilities import toUnicode +##from Utilities import toUnicode from Debugger.DebugClientCapabilities import HasShell, HasCompleter @@ -576,7 +576,8 @@ """ line, col = self.__getEndPos() self.setCursorPosition(line, col) - self.insert(toUnicode(s)) +## self.insert(toUnicode(s)) + self.insert(s) self.prline, self.prcol = self.getCursorPosition() self.ensureCursorVisible() self.ensureLineVisible(self.prline)
--- a/QScintilla/Terminal.py Fri Jan 08 17:04:18 2010 +0000 +++ b/QScintilla/Terminal.py Fri Jan 08 19:14:19 2010 +0000 @@ -24,7 +24,7 @@ import Utilities import UI.PixmapCache -from Utilities import toUnicode +##from Utilities import toUnicode from .ShellHistoryDialog import ShellHistoryDialog @@ -423,7 +423,8 @@ """ line, col = self.__getEndPos() self.setCursorPosition(line, col) - self.insert(toUnicode(s)) +## self.insert(toUnicode(s)) + self.insert(s) self.prline, self.prcol = self.getCursorPosition() self.ensureCursorVisible() self.ensureLineVisible(self.prline)
--- a/Utilities/__init__.py Fri Jan 08 17:04:18 2010 +0000 +++ b/Utilities/__init__.py Fri Jan 08 19:14:19 2010 +0000 @@ -22,8 +22,7 @@ from codecs import BOM_UTF8, BOM_UTF16, BOM_UTF32 from PyQt4.QtCore import QRegExp, QDir, QProcess, Qt, \ - qVersion, PYQT_VERSION_STR -from PyQt4.QtGui import QApplication + qVersion, PYQT_VERSION_STR, QCoreApplication from PyQt4.Qsci import QSCINTILLA_VERSION_STR, QsciScintilla from Globals import isWindowsPlatform # import this method into the Utilities namespace @@ -37,212 +36,214 @@ configDir = None -coding_regexps = [ - (2, re.compile(br'''coding[:=]\s*([-\w_.]+)''')), - (1, re.compile(br'''<\?xml.*\bencoding\s*=\s*['"]([-\w_.]+)['"]\?>''')), -] +##coding_regexps = [ +## (2, re.compile(br'''coding[:=]\s*([-\w_.]+)''')), +## (1, re.compile(br'''<\?xml.*\bencoding\s*=\s*['"]([-\w_.]+)['"]\?>''')), +##] supportedCodecs = ['utf-8', 'iso8859-1', 'iso8859-15', 'iso8859-2', 'iso8859-3', 'iso8859-4', 'iso8859-5', 'iso8859-6', 'iso8859-7', 'iso8859-8', 'iso8859-9', 'iso8859-10', 'iso8859-11', 'iso8859-13', 'iso8859-14', 'iso8859-16', 'latin-1', - 'koi8-r', 'koi8-u', 'utf-16', + 'koi8-r', 'koi8-u', + 'utf-16', 'utf-32', 'cp037', 'cp424', 'cp437', 'cp500', 'cp737', 'cp775', 'cp850', 'cp852', 'cp855', 'cp856', 'cp857', 'cp860', 'cp861', 'cp862', 'cp863', 'cp864', 'cp865', 'cp866', - 'cp874', 'cp875', 'cp932', 'cp949', 'cp950', 'cp1006', - 'cp1026', 'cp1140', 'cp1250', 'cp1251', 'cp1252', - 'cp1253', 'cp1254', 'cp1255', 'cp1256', 'cp1257', - 'cp1258', + 'cp869', 'cp874', 'cp875', 'cp932', 'cp949', 'cp950', + 'cp1006', 'cp1026', 'cp1140', 'cp1250', 'cp1251', + 'cp1252', 'cp1253', 'cp1254', 'cp1255', 'cp1256', + 'cp1257', 'cp1258', + 'gb2312', 'gb18030', 'ascii'] -class CodingError(Exception): - """ - Class implementing an exception, which is raised, if a given coding is incorrect. - """ - def __init__(self, coding): - """ - Constructor - """ - self.errorMessage = QApplication.translate("CodingError", - "The coding '{0}' is wrong for the given text.").format(coding) - - def __repr__(self): - """ - Private method returning a representation of the exception. - - @return string representing the error message - """ - return str(self.errorMessage) - - def __str__(self): - """ - Private method returning a string representation of the exception. - - @return string representing the error message - """ - return str(self.errorMessage) - -def get_coding(text): - """ - Function to get the coding of a text. - - @param text text to inspect (string) - @return coding string - """ - lines = text.splitlines() - for coding in coding_regexps: - coding_re = coding[1] - head = lines[:coding[0]] - for l in head: - m = coding_re.search(l) - if m: - return m.group(1).lower() - return None - -def decode(text): - """ - Function to decode a text. - - @param text text to decode (string) - @return decoded text and encoding - """ - try: - if text.startswith(BOM_UTF8): - # UTF-8 with BOM - return str(text[len(BOM_UTF8):], 'utf-8'), 'utf-8-bom' - elif text.startswith(BOM_UTF16): - # UTF-16 with BOM - return str(text[len(BOM_UTF16):], 'utf-16'), 'utf-16' - elif text.startswith(BOM_UTF32): - # UTF-32 with BOM - return str(text[len(BOM_UTF32):], 'utf-32'), 'utf-32' - coding = get_coding(text) - if coding: - coding = coding.decode() - return text.decode(coding), coding - except (UnicodeError, LookupError): - pass - - guess = None - if Preferences.getEditor("AdvancedEncodingDetection"): - # Try the universal character encoding detector - try: - import ThirdParty.CharDet.chardet - guess = ThirdParty.CharDet.chardet.detect(text) - if guess and guess['confidence'] > 0.95 and guess['encoding'] is not None: - codec = guess['encoding'].lower() - return str(text, codec), '%s-guessed' % codec - except (UnicodeError, LookupError): - pass - except ImportError: - pass - - # Try default encoding - try: - codec = Preferences.getEditor("DefaultEncoding") - return str(text, codec), '%s-default' % codec - except (UnicodeError, LookupError): - pass - - # Assume UTF-8 - try: - return str(text, 'utf-8'), 'utf-8-guessed' - except (UnicodeError, LookupError): - pass - - if Preferences.getEditor("AdvancedEncodingDetection"): - # Use the guessed one even if confifence level is low - if guess and guess['encoding'] is not None: - try: - codec = guess['encoding'].lower() - return str(text, codec), '%s-guessed' % codec - except (UnicodeError, LookupError): - pass - - # Assume Latin-1 (behaviour before 3.7.1) - return str(text, "latin-1"), 'latin-1-guessed' - -def encode(text, orig_coding): - """ - Function to encode a text. - - @param text text to encode (string) - @param orig_coding type of the original coding (string) - @return encoded text and encoding - """ - if orig_coding == 'utf-8-bom': - return BOM_UTF8 + text.encode("utf-8"), 'utf-8-bom' - - # Try declared coding spec - coding = get_coding(text) - if coding: - try: - return text.encode(coding), coding - except (UnicodeError, LookupError): - # Error: Declared encoding is incorrect - raise CodingError(coding) - - if orig_coding and orig_coding.endswith('-selected'): - coding = orig_coding.replace("-selected", "") - try: - return text.encode(coding), coding - except (UnicodeError, LookupError): - pass - if orig_coding and orig_coding.endswith('-default'): - coding = orig_coding.replace("-default", "") - try: - return text.encode(coding), coding - except (UnicodeError, LookupError): - pass - if orig_coding and orig_coding.endswith('-guessed'): - coding = orig_coding.replace("-guessed", "") - try: - return text.encode(coding), coding - except (UnicodeError, LookupError): - pass - - # Try configured default - try: - codec = Preferences.getEditor("DefaultEncoding") - return text.encode(codec), codec - except (UnicodeError, LookupError): - pass - - # Try saving as ASCII - try: - return text.encode('ascii'), 'ascii' - except UnicodeError: - pass - - # Save as UTF-8 without BOM - return text.encode('utf-8'), 'utf-8' - -def toUnicode(s): - """ - Public method to convert a string to unicode. - - Various codes are tried until one converts the string without an error. - If all codecs fail, the string is returned unaltered. - - @param s string to be converted (string) - @return converted string (unicode) - """ - if isinstance(s, str): - return s - - for codec in supportedCodecs: - try: - u = str(s, codec) - return u - except UnicodeError: - pass - except TypeError: - break - - # we didn't succeed - return s - +##class CodingError(Exception): +## """ +## Class implementing an exception, which is raised, if a given coding is incorrect. +## """ +## def __init__(self, coding): +## """ +## Constructor +## """ +## self.errorMessage = QApplication.translate("CodingError", +## "The coding '{0}' is wrong for the given text.").format(coding) +## +## def __repr__(self): +## """ +## Private method returning a representation of the exception. +## +## @return string representing the error message +## """ +## return str(self.errorMessage) +## +## def __str__(self): +## """ +## Private method returning a string representation of the exception. +## +## @return string representing the error message +## """ +## return str(self.errorMessage) +## +##def get_coding(text): +## """ +## Function to get the coding of a text. +## +## @param text text to inspect (string) +## @return coding string +## """ +## lines = text.splitlines() +## for coding in coding_regexps: +## coding_re = coding[1] +## head = lines[:coding[0]] +## for l in head: +## m = coding_re.search(l) +## if m: +## return m.group(1).lower() +## return None +## +##def decode(text): +## """ +## Function to decode a text. +## +## @param text text to decode (string) +## @return decoded text and encoding +## """ +## try: +## if text.startswith(BOM_UTF8): +## # UTF-8 with BOM +## return str(text[len(BOM_UTF8):], 'utf-8'), 'utf-8-bom' +## elif text.startswith(BOM_UTF16): +## # UTF-16 with BOM +## return str(text[len(BOM_UTF16):], 'utf-16'), 'utf-16' +## elif text.startswith(BOM_UTF32): +## # UTF-32 with BOM +## return str(text[len(BOM_UTF32):], 'utf-32'), 'utf-32' +## coding = get_coding(text) +## if coding: +## coding = coding.decode() +## return text.decode(coding), coding +## except (UnicodeError, LookupError): +## pass +## +## guess = None +## if Preferences.getEditor("AdvancedEncodingDetection"): +## # Try the universal character encoding detector +## try: +## import ThirdParty.CharDet.chardet +## guess = ThirdParty.CharDet.chardet.detect(text) +## if guess and guess['confidence'] > 0.95 and guess['encoding'] is not None: +## codec = guess['encoding'].lower() +## return str(text, codec), '%s-guessed' % codec +## except (UnicodeError, LookupError): +## pass +## except ImportError: +## pass +## +## # Try default encoding +## try: +## codec = Preferences.getEditor("DefaultEncoding") +## return str(text, codec), '%s-default' % codec +## except (UnicodeError, LookupError): +## pass +## +## # Assume UTF-8 +## try: +## return str(text, 'utf-8'), 'utf-8-guessed' +## except (UnicodeError, LookupError): +## pass +## +## if Preferences.getEditor("AdvancedEncodingDetection"): +## # Use the guessed one even if confifence level is low +## if guess and guess['encoding'] is not None: +## try: +## codec = guess['encoding'].lower() +## return str(text, codec), '%s-guessed' % codec +## except (UnicodeError, LookupError): +## pass +## +## # Assume Latin-1 (behaviour before 3.7.1) +## return str(text, "latin-1"), 'latin-1-guessed' +## +##def encode(text, orig_coding): +## """ +## Function to encode a text. +## +## @param text text to encode (string) +## @param orig_coding type of the original coding (string) +## @return encoded text and encoding +## """ +## if orig_coding == 'utf-8-bom': +## return BOM_UTF8 + text.encode("utf-8"), 'utf-8-bom' +## +## # Try declared coding spec +## coding = get_coding(text) +## if coding: +## try: +## return text.encode(coding), coding +## except (UnicodeError, LookupError): +## # Error: Declared encoding is incorrect +## raise CodingError(coding) +## +## if orig_coding and orig_coding.endswith('-selected'): +## coding = orig_coding.replace("-selected", "") +## try: +## return text.encode(coding), coding +## except (UnicodeError, LookupError): +## pass +## if orig_coding and orig_coding.endswith('-default'): +## coding = orig_coding.replace("-default", "") +## try: +## return text.encode(coding), coding +## except (UnicodeError, LookupError): +## pass +## if orig_coding and orig_coding.endswith('-guessed'): +## coding = orig_coding.replace("-guessed", "") +## try: +## return text.encode(coding), coding +## except (UnicodeError, LookupError): +## pass +## +## # Try configured default +## try: +## codec = Preferences.getEditor("DefaultEncoding") +## return text.encode(codec), codec +## except (UnicodeError, LookupError): +## pass +## +## # Try saving as ASCII +## try: +## return text.encode('ascii'), 'ascii' +## except UnicodeError: +## pass +## +## # Save as UTF-8 without BOM +## return text.encode('utf-8'), 'utf-8' +## +##def toUnicode(s): +## """ +## Public method to convert a string to unicode. +## +## Various codes are tried until one converts the string without an error. +## If all codecs fail, the string is returned unaltered. +## +## @param s string to be converted (string) +## @return converted string (unicode) +## """ +## if isinstance(s, str): +## return s +## +## for codec in supportedCodecs: +## try: +## u = str(s, codec) +## return u +## except UnicodeError: +## pass +## except TypeError: +## break +## +## # we didn't succeed +## return s +## _escape = re.compile(eval(r'"[&<>\"\u0080-\uffff]"')) _escape_map = { @@ -794,7 +795,7 @@ @returns help text (string) """ - return QApplication.translate("Utilities", + return QCoreApplication.translate("Utilities", """<p>You may use %-codes as placeholders in the string.""" """ Supported codes are:""" """<table>""" @@ -1089,9 +1090,9 @@ info = "Version Numbers:%s Python %s%s" % \ (linesep, sys.version.split()[0], linesep) info += " Qt %s%s PyQt4 %s%s" % \ - (str(qVersion()), linesep, str(PYQT_VERSION_STR), linesep) + (qVersion(), linesep, PYQT_VERSION_STR, linesep) info += " sip %s%s QScintilla %s%s" % \ - (str(sip_version_str), linesep, str(QSCINTILLA_VERSION_STR), linesep) + (sip_version_str, linesep, QSCINTILLA_VERSION_STR, linesep) info += " %s %s%s" % \ (Program, Version, linesep * 2) info += "Platform: %s%s%s%s" % \
