Mercurial Repositories > eric / changeset
changeset
Finished renaming eric5 for PyQt5 to eric6.
Sat, 05 Jul 2014 12:13:23 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Sat, 05 Jul 2014 12:13:23 +0200
- changeset 3670
- f0cb7579c0b4
- parent 3669
- ac84ac3c0f05
- child 3673
- e26d7d0c1088
Finished renaming eric5 for PyQt5 to eric6.
--- a/DebugClients/Python/DCTestResult.py Sat Jul 05 11:41:14 2014 +0200 +++ b/DebugClients/Python/DCTestResult.py Sat Jul 05 12:13:23 2014 +0200 @@ -4,7 +4,7 @@ # """ -Module implementing a TestResult derivative for the eric5 debugger. +Module implementing a TestResult derivative for the eric6 debugger. """ import select @@ -18,7 +18,7 @@ class DCTestResult(TestResult): """ - A TestResult derivative to work with eric5's debug client. + A TestResult derivative to work with eric6's debug client. For more details see unittest.py of the standard python distribution. """
--- a/DebugClients/Python/DebugBase.py Sat Jul 05 11:41:14 2014 +0200 +++ b/DebugClients/Python/DebugBase.py Sat Jul 05 12:13:23 2014 +0200 @@ -508,7 +508,7 @@ Public method reimplemented from bdb.py to get the first breakpoint of a particular line. - Because eric5 supports only one breakpoint per line, this overwritten + Because eric6 supports only one breakpoint per line, this overwritten method will return this one and only breakpoint. @param filename filename of the bp to retrieve (string)
--- a/DebugClients/Python/FlexCompleter.py Sat Jul 05 11:41:14 2014 +0200 +++ b/DebugClients/Python/FlexCompleter.py Sat Jul 05 12:13:23 2014 +0200 @@ -1,12 +1,12 @@ # -*- coding: utf-8 -*- """ -Word completion for the eric5 shell. +Word completion for the eric6 shell. -<h4>NOTE for eric5 variant</h4> +<h4>NOTE for eric6 variant</h4> This version is a re-implementation of FlexCompleter - as found in the PyQwt package. It is modified to work with the eric5 debug + as found in the PyQwt package. It is modified to work with the eric6 debug clients.
--- a/DebugClients/Python/coverage/control.py Sat Jul 05 11:41:14 2014 +0200 +++ b/DebugClients/Python/coverage/control.py Sat Jul 05 12:13:23 2014 +0200 @@ -11,7 +11,7 @@ from .debug import DebugControl from .files import FileLocator, TreeMatcher, FnmatchMatcher from .files import PathAliases, find_python_files, prep_patterns -#from .html import HtmlReporter # Comment for eric5 +#from .html import HtmlReporter # Comment for eric6 from .misc import CoverageException, bool_or_none, join_regex from .misc import file_be_gone from .results import Analysis, Numbers
--- a/DebugClients/Python/eric5dbgstub.py Sat Jul 05 11:41:14 2014 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,94 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright (c) 2002 - 2014 Detlev Offenbach <detlev@die-offenbachs.de> -# - -""" -Module implementing a debugger stub for remote debugging. -""" - -import os -import sys -import distutils.sysconfig - -from eric5config import getConfig - -debugger = None -__scriptname = None - -modDir = distutils.sysconfig.get_python_lib(True) -ericpath = os.getenv('ERICDIR', getConfig('ericDir')) - -if ericpath not in sys.path: - sys.path.insert(-1, ericpath) - - -def initDebugger(kind="standard"): - """ - Module function to initialize a debugger for remote debugging. - - @param kind type of debugger ("standard" or "threads") - @return flag indicating success (boolean) - @exception ValueError raised to indicate an invalid debugger kind - was requested - """ - global debugger - res = 1 - try: - if kind == "standard": - import DebugClient - debugger = DebugClient.DebugClient() - elif kind == "threads": - import DebugClientThreads - debugger = DebugClientThreads.DebugClientThreads() - else: - raise ValueError - except ImportError: - debugger = None - res = 0 - - return res - - -def runcall(func, *args): - """ - Module function mimicing the Pdb interface. - - @param func function to be called (function object) - @param *args arguments being passed to func - @return the function result - """ - global debugger, __scriptname - return debugger.run_call(__scriptname, func, *args) - - -def setScriptname(name): - """ - Module function to set the scriptname to be reported back to the IDE. - - @param name absolute pathname of the script (string) - """ - global __scriptname - __scriptname = name - - -def startDebugger(enableTrace=True, exceptions=True, - tracePython=False, redirect=True): - """ - Module function used to start the remote debugger. - - @keyparam enableTrace flag to enable the tracing function (boolean) - @keyparam exceptions flag to enable exception reporting of the IDE - (boolean) - @keyparam tracePython flag to enable tracing into the Python library - (boolean) - @keyparam redirect flag indicating redirection of stdin, stdout and - stderr (boolean) - """ - global debugger - if debugger: - debugger.startDebugger(enableTrace=enableTrace, exceptions=exceptions, - tracePython=tracePython, redirect=redirect) - -# -# eflag: FileType = Python2
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/DebugClients/Python/eric6dbgstub.py Sat Jul 05 12:13:23 2014 +0200 @@ -0,0 +1,94 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2002 - 2014 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing a debugger stub for remote debugging. +""" + +import os +import sys +import distutils.sysconfig + +from eric6config import getConfig + +debugger = None +__scriptname = None + +modDir = distutils.sysconfig.get_python_lib(True) +ericpath = os.getenv('ERICDIR', getConfig('ericDir')) + +if ericpath not in sys.path: + sys.path.insert(-1, ericpath) + + +def initDebugger(kind="standard"): + """ + Module function to initialize a debugger for remote debugging. + + @param kind type of debugger ("standard" or "threads") + @return flag indicating success (boolean) + @exception ValueError raised to indicate an invalid debugger kind + was requested + """ + global debugger + res = 1 + try: + if kind == "standard": + import DebugClient + debugger = DebugClient.DebugClient() + elif kind == "threads": + import DebugClientThreads + debugger = DebugClientThreads.DebugClientThreads() + else: + raise ValueError + except ImportError: + debugger = None + res = 0 + + return res + + +def runcall(func, *args): + """ + Module function mimicing the Pdb interface. + + @param func function to be called (function object) + @param *args arguments being passed to func + @return the function result + """ + global debugger, __scriptname + return debugger.run_call(__scriptname, func, *args) + + +def setScriptname(name): + """ + Module function to set the scriptname to be reported back to the IDE. + + @param name absolute pathname of the script (string) + """ + global __scriptname + __scriptname = name + + +def startDebugger(enableTrace=True, exceptions=True, + tracePython=False, redirect=True): + """ + Module function used to start the remote debugger. + + @keyparam enableTrace flag to enable the tracing function (boolean) + @keyparam exceptions flag to enable exception reporting of the IDE + (boolean) + @keyparam tracePython flag to enable tracing into the Python library + (boolean) + @keyparam redirect flag indicating redirection of stdin, stdout and + stderr (boolean) + """ + global debugger + if debugger: + debugger.startDebugger(enableTrace=enableTrace, exceptions=exceptions, + tracePython=tracePython, redirect=redirect) + +# +# eflag: FileType = Python2
--- a/DebugClients/Python3/DCTestResult.py Sat Jul 05 11:41:14 2014 +0200 +++ b/DebugClients/Python3/DCTestResult.py Sat Jul 05 12:13:23 2014 +0200 @@ -4,7 +4,7 @@ # """ -Module implementing a TestResult derivative for the eric5 debugger. +Module implementing a TestResult derivative for the eric6 debugger. """ import select @@ -18,7 +18,7 @@ class DCTestResult(TestResult): """ - A TestResult derivative to work with eric5's debug client. + A TestResult derivative to work with eric6's debug client. For more details see unittest.py of the standard python distribution. """
--- a/DebugClients/Python3/DebugBase.py Sat Jul 05 11:41:14 2014 +0200 +++ b/DebugClients/Python3/DebugBase.py Sat Jul 05 12:13:23 2014 +0200 @@ -517,7 +517,7 @@ Public method reimplemented from bdb.py to get the first breakpoint of a particular line. - Because eric5 supports only one breakpoint per line, this overwritten + Because eric6 supports only one breakpoint per line, this overwritten method will return this one and only breakpoint. @param filename the filename of the bp to retrieve (string)
--- a/DebugClients/Python3/FlexCompleter.py Sat Jul 05 11:41:14 2014 +0200 +++ b/DebugClients/Python3/FlexCompleter.py Sat Jul 05 12:13:23 2014 +0200 @@ -1,12 +1,12 @@ # -*- coding: utf-8 -*- """ -Word completion for the eric5 shell. +Word completion for the eric6 shell. -<h4>NOTE for eric5 variant</h4> +<h4>NOTE for eric6 variant</h4> This version is a re-implementation of rlcompleter - as found in the Python3 library. It is modified to work with the eric5 + as found in the Python3 library. It is modified to work with the eric6 debug clients. <h4>Original rlcompleter documentation</h4>
--- a/DebugClients/Python3/coverage/control.py Sat Jul 05 11:41:14 2014 +0200 +++ b/DebugClients/Python3/coverage/control.py Sat Jul 05 12:13:23 2014 +0200 @@ -11,7 +11,7 @@ from .debug import DebugControl from .files import FileLocator, TreeMatcher, FnmatchMatcher from .files import PathAliases, find_python_files, prep_patterns -#from .html import HtmlReporter # Comment for eric5 +#from .html import HtmlReporter # Comment for eric6 from .misc import CoverageException, bool_or_none, join_regex from .misc import file_be_gone from .results import Analysis, Numbers
--- a/DebugClients/Python3/eric5dbgstub.py Sat Jul 05 11:41:14 2014 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,90 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright (c) 2009 - 2014 Detlev Offenbach <detlev@die-offenbachs.de> -# - -""" -Module implementing a debugger stub for remote debugging. -""" - -import os -import sys -import distutils.sysconfig - -from eric5config import getConfig - -debugger = None -__scriptname = None - -modDir = distutils.sysconfig.get_python_lib(True) -ericpath = os.getenv('ERICDIR', getConfig('ericDir')) - -if ericpath not in sys.path: - sys.path.insert(-1, ericpath) - - -def initDebugger(kind="standard"): - """ - Module function to initialize a debugger for remote debugging. - - @param kind type of debugger ("standard" or "threads") - @return flag indicating success (boolean) - @exception ValueError raised to indicate a wrong debugger kind - """ - global debugger - res = True - try: - if kind == "standard": - import DebugClient - debugger = DebugClient.DebugClient() - elif kind == "threads": - import DebugClientThreads - debugger = DebugClientThreads.DebugClientThreads() - else: - raise ValueError - except ImportError: - debugger = None - res = False - - return res - - -def runcall(func, *args): - """ - Module function mimicing the Pdb interface. - - @param func function to be called (function object) - @param *args arguments being passed to func - @return the function result - """ - global debugger, __scriptname - return debugger.run_call(__scriptname, func, *args) - - -def setScriptname(name): - """ - Module function to set the scriptname to be reported back to the IDE. - - @param name absolute pathname of the script (string) - """ - global __scriptname - __scriptname = name - - -def startDebugger(enableTrace=True, exceptions=True, - tracePython=False, redirect=True): - """ - Module function used to start the remote debugger. - - @keyparam enableTrace flag to enable the tracing function (boolean) - @keyparam exceptions flag to enable exception reporting of the IDE - (boolean) - @keyparam tracePython flag to enable tracing into the Python library - (boolean) - @keyparam redirect flag indicating redirection of stdin, stdout and - stderr (boolean) - """ - global debugger - if debugger: - debugger.startDebugger(enableTrace=enableTrace, exceptions=exceptions, - tracePython=tracePython, redirect=redirect)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/DebugClients/Python3/eric6dbgstub.py Sat Jul 05 12:13:23 2014 +0200 @@ -0,0 +1,90 @@ +# -*- coding: utf-8 -*- + +# Copyright (c) 2009 - 2014 Detlev Offenbach <detlev@die-offenbachs.de> +# + +""" +Module implementing a debugger stub for remote debugging. +""" + +import os +import sys +import distutils.sysconfig + +from eric6config import getConfig + +debugger = None +__scriptname = None + +modDir = distutils.sysconfig.get_python_lib(True) +ericpath = os.getenv('ERICDIR', getConfig('ericDir')) + +if ericpath not in sys.path: + sys.path.insert(-1, ericpath) + + +def initDebugger(kind="standard"): + """ + Module function to initialize a debugger for remote debugging. + + @param kind type of debugger ("standard" or "threads") + @return flag indicating success (boolean) + @exception ValueError raised to indicate a wrong debugger kind + """ + global debugger + res = True + try: + if kind == "standard": + import DebugClient + debugger = DebugClient.DebugClient() + elif kind == "threads": + import DebugClientThreads + debugger = DebugClientThreads.DebugClientThreads() + else: + raise ValueError + except ImportError: + debugger = None + res = False + + return res + + +def runcall(func, *args): + """ + Module function mimicing the Pdb interface. + + @param func function to be called (function object) + @param *args arguments being passed to func + @return the function result + """ + global debugger, __scriptname + return debugger.run_call(__scriptname, func, *args) + + +def setScriptname(name): + """ + Module function to set the scriptname to be reported back to the IDE. + + @param name absolute pathname of the script (string) + """ + global __scriptname + __scriptname = name + + +def startDebugger(enableTrace=True, exceptions=True, + tracePython=False, redirect=True): + """ + Module function used to start the remote debugger. + + @keyparam enableTrace flag to enable the tracing function (boolean) + @keyparam exceptions flag to enable exception reporting of the IDE + (boolean) + @keyparam tracePython flag to enable tracing into the Python library + (boolean) + @keyparam redirect flag indicating redirection of stdin, stdout and + stderr (boolean) + """ + global debugger + if debugger: + debugger.startDebugger(enableTrace=enableTrace, exceptions=exceptions, + tracePython=tracePython, redirect=redirect)
--- a/Debugger/DebugUI.py Sat Jul 05 11:41:14 2014 +0200 +++ b/Debugger/DebugUI.py Sat Jul 05 12:13:23 2014 +0200 @@ -28,7 +28,7 @@ from E5Gui.E5Action import E5Action, createActionGroup from E5Gui import E5MessageBox -from eric5config import getConfig +from eric6config import getConfig class DebugUI(QObject): @@ -1567,7 +1567,7 @@ if not doNotStart: if runProject and self.project.getProjectType() == "E4Plugin": argv = '--plugin="{0}" {1}'.format(fn, argv) - fn = os.path.join(getConfig('ericDir'), "eric5.py") + fn = os.path.join(getConfig('ericDir'), "eric6.py") self.debugViewer.initCallStackViewer(runProject) @@ -1685,7 +1685,7 @@ if not doNotStart: if runProject and self.project.getProjectType() == "E4Plugin": argv = '--plugin="{0}" {1}'.format(fn, argv) - fn = os.path.join(getConfig('ericDir'), "eric5.py") + fn = os.path.join(getConfig('ericDir'), "eric6.py") self.debugViewer.initCallStackViewer(runProject) @@ -1806,7 +1806,7 @@ if not doNotStart: if runProject and self.project.getProjectType() == "E4Plugin": argv = '--plugin="{0}" {1}'.format(fn, argv) - fn = os.path.join(getConfig('ericDir'), "eric5.py") + fn = os.path.join(getConfig('ericDir'), "eric6.py") self.debugViewer.initCallStackViewer(runProject) @@ -1935,7 +1935,7 @@ if debugProject and \ self.project.getProjectType() == "E4Plugin": argv = '--plugin="{0}" {1}'.format(fn, argv) - fn = os.path.join(getConfig('ericDir'), "eric5.py") + fn = os.path.join(getConfig('ericDir'), "eric6.py") tracePython = True # override flag because it must be true self.debugViewer.initCallStackViewer(debugProject) @@ -1997,7 +1997,7 @@ if not doNotStart: if forProject and self.project.getProjectType() == "E4Plugin": argv = '--plugin="{0}" {1}'.format(fn, argv) - fn = os.path.join(getConfig('ericDir'), "eric5.py") + fn = os.path.join(getConfig('ericDir'), "eric6.py") self.debugViewer.initCallStackViewer(forProject)
--- a/Debugger/DebuggerInterfacePython.py Sat Jul 05 11:41:14 2014 +0200 +++ b/Debugger/DebuggerInterfacePython.py Sat Jul 05 12:13:23 2014 +0200 @@ -26,7 +26,7 @@ import Preferences import Utilities -from eric5config import getConfig +from eric6config import getConfig ClientDefaultCapabilities = DebugClientCapabilities.HasAll
--- a/Debugger/DebuggerInterfacePython3.py Sat Jul 05 11:41:14 2014 +0200 +++ b/Debugger/DebuggerInterfacePython3.py Sat Jul 05 12:13:23 2014 +0200 @@ -25,7 +25,7 @@ import Preferences import Utilities -from eric5config import getConfig +from eric6config import getConfig ClientDefaultCapabilities = DebugClientCapabilities.HasAll
--- a/Debugger/DebuggerInterfaceRuby.py Sat Jul 05 11:41:14 2014 +0200 +++ b/Debugger/DebuggerInterfaceRuby.py Sat Jul 05 12:13:23 2014 +0200 @@ -23,7 +23,7 @@ import Preferences import Utilities -from eric5config import getConfig +from eric6config import getConfig ClientDefaultCapabilities = \
--- a/DocumentationTools/Config.py Sat Jul 05 11:41:14 2014 +0200 +++ b/DocumentationTools/Config.py Sat Jul 05 12:13:23 2014 +0200 @@ -7,8 +7,8 @@ Module defining different default values for the documentation tools package. """ -# the default colors for the eric5 documentation generator -eric5docDefaultColors = { +# the default colors for the eric6 documentation generator +eric6docDefaultColors = { 'BodyColor': '#000000', 'BodyBgColor': '#FFFFFF', 'Level1HeaderColor': '#0000FF', @@ -20,7 +20,7 @@ 'LinkColor': '#0000FF', } -eric5docColorParameterNames = { +eric6docColorParameterNames = { 'BodyColor': 'body-color', 'BodyBgColor': 'body-background-color', 'Level1HeaderColor': 'l1header-color',
--- a/E5Gui/E5ComboBox.py Sat Jul 05 11:41:14 2014 +0200 +++ b/E5Gui/E5ComboBox.py Sat Jul 05 12:13:23 2014 +0200 @@ -4,7 +4,7 @@ # """ -Module implementing combobox classes using the eric5 line edits. +Module implementing combobox classes using the eric6 line edits. """ from __future__ import unicode_literals @@ -14,7 +14,7 @@ class E5ComboBox(QComboBox): """ - Class implementing a combobox using the eric5 line edit. + Class implementing a combobox using the eric6 line edit. """ def __init__(self, parent=None, inactiveText=""): """ @@ -52,7 +52,7 @@ class E5ClearableComboBox(E5ComboBox): """ - Class implementing a combobox using the eric5 line edit. + Class implementing a combobox using the eric6 line edit. """ def __init__(self, parent=None, inactiveText=""): """
--- a/E5Gui/E5ErrorMessage.py Sat Jul 05 11:41:14 2014 +0200 +++ b/E5Gui/E5ErrorMessage.py Sat Jul 05 12:13:23 2014 +0200 @@ -38,7 +38,7 @@ QSettings.IniFormat, QSettings.UserScope, Globals.settingsNameOrganization, - "eric5messagefilters") + "eric6messagefilters") self.__defaultFilters = [ "QFont::",
--- a/E5Gui/E5SingleApplication.py Sat Jul 05 11:41:14 2014 +0200 +++ b/E5Gui/E5SingleApplication.py Sat Jul 05 12:13:23 2014 +0200 @@ -22,7 +22,7 @@ # define some module global stuff ########################################################################### -SAFile = "eric5" +SAFile = "eric6" # define the protocol tokens SAOpenFile = '>OpenFile<'
--- a/E5XML/DebuggerPropertiesWriter.py Sat Jul 05 11:41:14 2014 +0200 +++ b/E5XML/DebuggerPropertiesWriter.py Sat Jul 05 12:13:23 2014 +0200 @@ -50,7 +50,7 @@ # add some generation comments self.writeComment( - " eric5 debugger properties file for project {0} ".format( + " eric6 debugger properties file for project {0} ".format( self.name)) self.writeComment( " This file was generated automatically, do not edit. ")
--- a/E5XML/HighlightingStylesWriter.py Sat Jul 05 11:41:14 2014 +0200 +++ b/E5XML/HighlightingStylesWriter.py Sat Jul 05 12:13:23 2014 +0200 @@ -47,7 +47,7 @@ highlightingStylesFileFormatVersion)) # add some generation comments - self.writeComment(" Eric5 highlighting styles ") + self.writeComment(" Eric6 highlighting styles ") self.writeComment( " Saved: {0}".format(time.strftime('%Y-%m-%d, %H:%M:%S'))) self.writeComment(" Author: {0} ".format(self.email))
--- a/E5XML/MultiProjectWriter.py Sat Jul 05 11:41:14 2014 +0200 +++ b/E5XML/MultiProjectWriter.py Sat Jul 05 12:13:23 2014 +0200 @@ -45,7 +45,7 @@ .format(multiProjectFileFormatVersion)) # add some generation comments - self.writeComment(" eric5 multi project file for multi project {0} " + self.writeComment(" eric6 multi project file for multi project {0} " .format(self.name)) if Preferences.getMultiProject("XMLTimestamp"): self.writeComment(
--- a/E5XML/ProjectWriter.py Sat Jul 05 11:41:14 2014 +0200 +++ b/E5XML/ProjectWriter.py Sat Jul 05 12:13:23 2014 +0200 @@ -47,7 +47,7 @@ # add some generation comments self.writeComment( - " eric5 project file for project {0} ".format(self.name)) + " eric6 project file for project {0} ".format(self.name)) if Preferences.getProject("XMLTimestamp"): self.writeComment( " Saved: {0} ".format(time.strftime('%Y-%m-%d, %H:%M:%S')))
--- a/E5XML/SessionWriter.py Sat Jul 05 11:41:14 2014 +0200 +++ b/E5XML/SessionWriter.py Sat Jul 05 12:13:23 2014 +0200 @@ -55,7 +55,7 @@ # add some generation comments if not isGlobal: self.writeComment( - " eric5 session file for project {0} ".format(self.name)) + " eric6 session file for project {0} ".format(self.name)) self.writeComment( " This file was generated automatically, do not edit. ") if Preferences.getProject("XMLTimestamp") or isGlobal:
--- a/E5XML/ShortcutsWriter.py Sat Jul 05 11:41:14 2014 +0200 +++ b/E5XML/ShortcutsWriter.py Sat Jul 05 12:13:23 2014 +0200 @@ -43,7 +43,7 @@ shortcutsFileFormatVersion)) # add some generation comments - self.writeComment(" Eric5 keyboard shortcuts ") + self.writeComment(" Eric6 keyboard shortcuts ") self.writeComment( " Saved: {0}".format(time.strftime('%Y-%m-%d, %H:%M:%S'))) self.writeComment(" Author: {0} ".format(self.email))
--- a/E5XML/TasksWriter.py Sat Jul 05 11:41:14 2014 +0200 +++ b/E5XML/TasksWriter.py Sat Jul 05 12:13:23 2014 +0200 @@ -49,12 +49,12 @@ # add some generation comments if self.forProject: self.writeComment( - " eric5 tasks file for project {0} ".format(self.name)) + " eric6 tasks file for project {0} ".format(self.name)) if Preferences.getProject("XMLTimestamp"): self.writeComment(" Saved: {0} ".format( time.strftime('%Y-%m-%d, %H:%M:%S'))) else: - self.writeComment(" eric5 tasks file ") + self.writeComment(" eric6 tasks file ") self.writeComment( " Saved: {0} ".format(time.strftime('%Y-%m-%d, %H:%M:%S')))
--- a/E5XML/TemplatesWriter.py Sat Jul 05 11:41:14 2014 +0200 +++ b/E5XML/TemplatesWriter.py Sat Jul 05 12:13:23 2014 +0200 @@ -41,7 +41,7 @@ templatesFileFormatVersion)) # add some generation comments - self.writeComment(" eric5 templates file ") + self.writeComment(" eric6 templates file ") self.writeComment( " Saved: {0} ".format(time.strftime('%Y-%m-%d, %H:%M:%S')))
--- a/E5XML/UserProjectWriter.py Sat Jul 05 11:41:14 2014 +0200 +++ b/E5XML/UserProjectWriter.py Sat Jul 05 12:13:23 2014 +0200 @@ -50,7 +50,7 @@ # add some generation comments self.writeComment( - " eric5 user project file for project {0} ".format(self.name)) + " eric6 user project file for project {0} ".format(self.name)) if Preferences.getProject("XMLTimestamp"): self.writeComment( " Saved: {0} ".format(time.strftime('%Y-%m-%d, %H:%M:%S')))
--- a/E5XML/XMLStreamReaderBase.py Sat Jul 05 11:41:14 2014 +0200 +++ b/E5XML/XMLStreamReaderBase.py Sat Jul 05 12:13:23 2014 +0200 @@ -4,7 +4,7 @@ # """ -Module implementing a base class for all of eric5s XML stream writers. +Module implementing a base class for all of eric6s XML stream writers. """ from __future__ import unicode_literals @@ -19,7 +19,7 @@ class XMLStreamReaderBase(QXmlStreamReader): """ - Class implementing a base class for all of eric5s XML stream readers. + Class implementing a base class for all of eric6s XML stream readers. """ def __init__(self, device): """
--- a/E5XML/XMLStreamWriterBase.py Sat Jul 05 11:41:14 2014 +0200 +++ b/E5XML/XMLStreamWriterBase.py Sat Jul 05 12:13:23 2014 +0200 @@ -4,7 +4,7 @@ # """ -Module implementing a base class for all of eric5s XML stream writers. +Module implementing a base class for all of eric6s XML stream writers. """ from __future__ import unicode_literals @@ -22,7 +22,7 @@ class XMLStreamWriterBase(QXmlStreamWriter): """ - Class implementing a base class for all of eric5s XML stream writers. + Class implementing a base class for all of eric6s XML stream writers. """ def __init__(self, device): """
--- a/E5XML/__init__.py Sat Jul 05 11:41:14 2014 +0200 +++ b/E5XML/__init__.py Sat Jul 05 12:13:23 2014 +0200 @@ -4,7 +4,7 @@ # """ -Package implementing the XML handling module of eric5. +Package implementing the XML handling module of eric6. This module includes XML handlers and writers for <ul>
--- a/Examples/rhallo.py Sat Jul 05 11:41:14 2014 +0200 +++ b/Examples/rhallo.py Sat Jul 05 12:13:23 2014 +0200 @@ -2,15 +2,15 @@ import sys -import eric5dbgstub +import eric6dbgstub def main(): print("Hello World!") sys.exit(0) if __name__ == "__main__": - if eric5dbgstub.initDebugger("standard"): -# or if eric5dbgstub.initDebugger("threads"): - eric5dbgstub.debugger.startDebugger() + if eric6dbgstub.initDebugger("standard"): +# or if eric6dbgstub.initDebugger("threads"): + eric6dbgstub.debugger.startDebugger() main()
--- a/Globals/__init__.py Sat Jul 05 11:41:14 2014 +0200 +++ b/Globals/__init__.py Sat Jul 05 12:13:23 2014 +0200 @@ -15,9 +15,9 @@ from PyQt5.QtCore import QDir, QLibraryInfo # names of the various settings objects -settingsNameOrganization = "Eric5" -settingsNameGlobal = "eric5" -settingsNameRecent = "eric5recent" +settingsNameOrganization = "Eric6" +settingsNameGlobal = "eric6" +settingsNameRecent = "eric6recent" # key names of the various recent entries recentNameMultiProject = "MultiProjects" @@ -81,7 +81,7 @@ for vers in BlackLists["sip"] + PlatformBlackLists["sip"]: if vers == sipVersion: print( - 'Sorry, sip version {0} is not compatible with eric5.' + 'Sorry, sip version {0} is not compatible with eric6.' .format(vers)) print('Please install another version.') return False @@ -96,7 +96,7 @@ # check for blacklisted versions for vers in BlackLists["PyQt5"] + PlatformBlackLists["PyQt5"]: if vers == pyqtVersion: - print('Sorry, PyQt5 version {0} is not compatible with eric5.' + print('Sorry, PyQt5 version {0} is not compatible with eric6.' .format(vers)) print('Please install another version.') return False @@ -112,7 +112,7 @@ if vers == scintillaVersion: print( 'Sorry, QScintilla2 version {0} is not compatible' - ' with eric5.'.format(vers)) + ' with eric6.'.format(vers)) print('Please install another version.') return False @@ -129,9 +129,9 @@ hp = configDir else: if isWindowsPlatform(): - cdn = "_eric5" + cdn = "_eric6" else: - cdn = ".eric5" + cdn = ".eric6" hp = QDir.homePath() dn = QDir(hp)
--- a/Graphics/UMLDialog.py Sat Jul 05 11:41:14 2014 +0200 +++ b/Graphics/UMLDialog.py Sat Jul 05 12:13:23 2014 +0200 @@ -222,7 +222,7 @@ self, self.tr("Save Diagram"), "", - self.tr("Eric5 Graphics File (*.e5g);;All Files (*)"), + self.tr("Eric6 Graphics File (*.e5g);;All Files (*)"), "", E5FileDialog.Options(E5FileDialog.DontConfirmOverwrite)) if not fname: @@ -280,7 +280,7 @@ self, self.tr("Load Diagram"), "", - self.tr("Eric5 Graphics File (*.e5g);;All Files (*)")) + self.tr("Eric6 Graphics File (*.e5g);;All Files (*)")) if not filename: # Cancelled by user return False
--- a/Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py Sat Jul 05 11:41:14 2014 +0200 +++ b/Helpviewer/Bookmarks/BookmarksImporters/XbelImporter.py Sat Jul 05 12:13:23 2014 +0200 @@ -34,11 +34,11 @@ bookmarksFile = BookmarksManager.getFileName() return ( UI.PixmapCache.getPixmap("ericWeb48.png"), - "eric5 Web Browser", + "eric6 Web Browser", os.path.basename(bookmarksFile), QCoreApplication.translate( "XbelImporter", - """eric5 Web Browser stores its bookmarks in the""" + """eric6 Web Browser stores its bookmarks in the""" """ <b>{0}</b> XML file. This file is usually located in""" ).format(os.path.basename(bookmarksFile)), QCoreApplication.translate( @@ -147,7 +147,7 @@ from ..BookmarkNode import BookmarkNode importRootNode.setType(BookmarkNode.Folder) if self._id == "e5browser": - importRootNode.title = self.tr("eric5 Web Browser Import") + importRootNode.title = self.tr("eric6 Web Browser Import") elif self._id == "konqueror": importRootNode.title = self.tr("Konqueror Import") elif self._id == "xbel":
--- a/Helpviewer/Bookmarks/BookmarksImporters/__init__.py Sat Jul 05 11:41:14 2014 +0200 +++ b/Helpviewer/Bookmarks/BookmarksImporters/__init__.py Sat Jul 05 12:13:23 2014 +0200 @@ -24,7 +24,7 @@ """ importers = [] importers.append( - (UI.PixmapCache.getIcon("ericWeb48.png"), "eric5 Web Browser", + (UI.PixmapCache.getIcon("ericWeb48.png"), "eric6 Web Browser", "e5browser")) importers.append( (UI.PixmapCache.getIcon("firefox.png"), "Mozilla Firefox", "firefox"))
--- a/Helpviewer/Bookmarks/BookmarksManager.py Sat Jul 05 11:41:14 2014 +0200 +++ b/Helpviewer/Bookmarks/BookmarksManager.py Sat Jul 05 12:13:23 2014 +0200 @@ -369,7 +369,7 @@ fileName, selectedFilter = E5FileDialog.getSaveFileNameAndFilter( None, self.tr("Export Bookmarks"), - "eric5_bookmarks.xbel", + "eric6_bookmarks.xbel", self.tr("XBEL bookmarks (*.xbel);;" "XBEL bookmarks (*.xml);;" "HTML Bookmarks (*.html)"))
--- a/Helpviewer/GreaseMonkey/GreaseMonkeyJavaScript.py Sat Jul 05 11:41:14 2014 +0200 +++ b/Helpviewer/GreaseMonkey/GreaseMonkeyJavaScript.py Sat Jul 05 12:13:23 2014 +0200 @@ -93,13 +93,13 @@ // GM Resource not supported if(typeof GM_getResourceText === "undefined") { function GM_getResourceText(resourceName) { - throw ("eric5 Web Browser: GM Resource is not supported!"); + throw ("eric6 Web Browser: GM Resource is not supported!"); } } if(typeof GM_getResourceURL === "undefined") { function GM_getResourceURL(resourceName) { - throw ("eric5 Web Browser: GM Resource is not supported!"); + throw ("eric6 Web Browser: GM Resource is not supported!"); } }
--- a/Helpviewer/GreaseMonkey/GreaseMonkeyManager.py Sat Jul 05 11:41:14 2014 +0200 +++ b/Helpviewer/GreaseMonkey/GreaseMonkeyManager.py Sat Jul 05 12:13:23 2014 +0200 @@ -303,7 +303,7 @@ @return reference to the created reply object (QNetworkReply) """ if op == QNetworkAccessManager.GetOperation and \ - request.rawHeader("X-Eric5-UserLoadAction") == QByteArray("1"): + request.rawHeader("X-Eric6-UserLoadAction") == QByteArray("1"): urlString = request.url().toString( QUrl.RemoveFragment | QUrl.RemoveQuery) if urlString.endswith(".user.js"):
--- a/Helpviewer/HelpBrowserWV.py Sat Jul 05 11:41:14 2014 +0200 +++ b/Helpviewer/HelpBrowserWV.py Sat Jul 05 12:13:23 2014 +0200 @@ -95,10 +95,10 @@ # the start page translations = [ QT_TRANSLATE_NOOP("JavaScriptEricObject", - "Welcome to eric5 Web Browser!"), - QT_TRANSLATE_NOOP("JavaScriptEricObject", "eric5 Web Browser"), + "Welcome to eric6 Web Browser!"), + QT_TRANSLATE_NOOP("JavaScriptEricObject", "eric6 Web Browser"), QT_TRANSLATE_NOOP("JavaScriptEricObject", "Search!"), - QT_TRANSLATE_NOOP("JavaScriptEricObject", "About eric5"), + QT_TRANSLATE_NOOP("JavaScriptEricObject", "About eric6"), ] def __init__(self, mw, parent=None): @@ -237,7 +237,7 @@ self.__lastRequestType) if self.__lastRequestType == \ QWebPage.NavigationTypeLinkClicked: - request.setRawHeader("X-Eric5-UserLoadAction", + request.setRawHeader("X-Eric6-UserLoadAction", QByteArray("1")) except TypeError: pass @@ -334,7 +334,7 @@ if info.domain == QWebPage.QtNetwork and \ info.error == QNetworkReply.OperationCanceledError and \ - info.errorString == "eric5:No Error": + info.errorString == "eric6:No Error": return False if info.domain == QWebPage.WebKit and info.error == 203: @@ -832,7 +832,7 @@ if not QFileInfo(name.toLocalFile()).exists(): E5MessageBox.critical( self, - self.tr("eric5 Web Browser"), + self.tr("eric6 Web Browser"), self.tr( """<p>The file <b>{0}</b> does not exist.</p>""") .format(name.toLocalFile())) @@ -846,7 +846,7 @@ if not started: E5MessageBox.critical( self, - self.tr("eric5 Web Browser"), + self.tr("eric6 Web Browser"), self.tr( """<p>Could not start a viewer""" """ for file <b>{0}</b>.</p>""") @@ -857,7 +857,7 @@ if not started: E5MessageBox.critical( self, - self.tr("eric5 Web Browser"), + self.tr("eric6 Web Browser"), self.tr( """<p>Could not start an application""" """ for URL <b>{0}</b>.</p>""") @@ -877,7 +877,7 @@ if not started: E5MessageBox.critical( self, - self.tr("eric5 Web Browser"), + self.tr("eric6 Web Browser"), self.tr( """<p>Could not start a viewer""" """ for file <b>{0}</b>.</p>""") @@ -2330,7 +2330,7 @@ except AttributeError: E5MessageBox.critical( self, - self.tr("eric5 Web Browser"), + self.tr("eric6 Web Browser"), self.tr( """<p>Printing is not available due to a bug in""" """ PyQt5. Please upgrade.</p>""")) @@ -2376,7 +2376,7 @@ except AttributeError: E5MessageBox.critical( self, - self.tr("eric5 Web Browser"), + self.tr("eric6 Web Browser"), self.tr( """<p>Printing is not available due to a bug in PyQt5.""" """Please upgrade.</p>""")) @@ -2408,7 +2408,7 @@ except AttributeError: E5MessageBox.critical( self, - self.tr("eric5 Web Browser"), + self.tr("eric6 Web Browser"), self.tr( """<p>Printing is not available due to a bug in""" """ PyQt5. Please upgrade.</p>"""))
--- a/Helpviewer/HelpDocsInstaller.py Sat Jul 05 11:41:14 2014 +0200 +++ b/Helpviewer/HelpDocsInstaller.py Sat Jul 05 12:13:23 2014 +0200 @@ -14,7 +14,7 @@ QLibraryInfo, QFileInfo from PyQt5.QtHelp import QHelpEngineCore -from eric5config import getConfig +from eric6config import getConfig class HelpDocsInstaller(QThread): @@ -85,7 +85,7 @@ return self.__mutex.unlock() - changes |= self.__installEric5Doc(engine) + changes |= self.__installEric6Doc(engine) engine = None del engine self.docsInstalled.emit(changes) @@ -164,14 +164,14 @@ return False - def __installEric5Doc(self, engine): + def __installEric6Doc(self, engine): """ - Private method to install/update the eric5 help documentation. + Private method to install/update the eric6 help documentation. @param engine reference to the help engine (QHelpEngineCore) @return flag indicating success (boolean) """ - versionKey = "eric5_ide" + versionKey = "eric6_ide" info = engine.customValue(versionKey, "") lst = info.split('|')
--- a/Helpviewer/HelpTabWidget.py Sat Jul 05 11:41:14 2014 +0200 +++ b/Helpviewer/HelpTabWidget.py Sat Jul 05 12:13:23 2014 +0200 @@ -28,7 +28,7 @@ import Utilities import Preferences -from eric5config import getConfig +from eric6config import getConfig class HelpTabWidget(E5TabWidget): @@ -249,7 +249,7 @@ return req = QNetworkRequest(self.widget(idx).url()) - req.setRawHeader("X-Eric5-UserLoadAction", b"1") + req.setRawHeader("X-Eric6-UserLoadAction", b"1") self.newBrowser(None, (req, QNetworkAccessManager.GetOperation, b"")) def __tabContextMenuClose(self): @@ -543,7 +543,7 @@ except AttributeError: E5MessageBox.critical( self, - self.tr("eric5 Web Browser"), + self.tr("eric6 Web Browser"), self.tr( """<p>Printing is not available due to a bug in""" """ PyQt5. Please upgrade.</p>""")) @@ -589,7 +589,7 @@ except AttributeError: E5MessageBox.critical( self, - self.tr("eric5 Web Browser"), + self.tr("eric6 Web Browser"), self.tr( """<p>Printing is not available due to a bug in""" """ PyQt5. Please upgrade.</p>""")) @@ -643,7 +643,7 @@ except AttributeError: E5MessageBox.critical( self, - self.tr("eric5 Web Browser"), + self.tr("eric6 Web Browser"), self.tr( """<p>Printing is not available due to a bug in PyQt5.""" """Please upgrade.</p>""")) @@ -857,7 +857,7 @@ edit = self.sender() url = self.__guessUrlFromPath(edit.text()) request = QNetworkRequest(url) - request.setRawHeader("X-Eric5-UserLoadAction", b"1") + request.setRawHeader("X-Eric6-UserLoadAction", b"1") if e5App().keyboardModifiers() == Qt.AltModifier: self.newBrowser( None, (request, QNetworkAccessManager.GetOperation, b""))
--- a/Helpviewer/HelpWindow.py Sat Jul 05 11:41:14 2014 +0200 +++ b/Helpviewer/HelpWindow.py Sat Jul 05 12:13:23 2014 +0200 @@ -98,14 +98,14 @@ @param parent parent widget of this window (QWidget) @param name name of this window (string) @param fromEric flag indicating whether it was called from within - eric5 (boolean) + eric6 (boolean) @keyparam initShortcutsOnly flag indicating to just initialize the keyboard shortcuts (boolean) @keyparam searchWord word to search for (string) """ super(HelpWindow, self).__init__(parent) self.setObjectName(name) - self.setWindowTitle(self.tr("eric5 Web Browser")) + self.setWindowTitle(self.tr("eric6 Web Browser")) self.fromEric = fromEric self.__class__._fromEric = fromEric @@ -139,7 +139,7 @@ if self.useQtHelp: self.__helpEngine = \ QHelpEngine(os.path.join(Utilities.getConfigDir(), - "browser", "eric5help.qhc"), self) + "browser", "eric6help.qhc"), self) self.__removeOldDocumentation() self.__helpEngine.warning.connect(self.__warning) else: @@ -680,10 +680,10 @@ self.tr('&Quit'), QKeySequence(self.tr("Ctrl+Q", "File|Quit")), 0, self, 'help_file_quit') - self.exitAct.setStatusTip(self.tr('Quit the eric5 Web Browser')) + self.exitAct.setStatusTip(self.tr('Quit the eric6 Web Browser')) self.exitAct.setWhatsThis(self.tr( """<b>Quit</b>""" - """<p>Quit the eric5 Web Browser.</p>""" + """<p>Quit the eric6 Web Browser.</p>""" )) if not self.initShortcutsOnly: if self.fromEric: @@ -2071,11 +2071,11 @@ """ E5MessageBox.about( self, - self.tr("eric5 Web Browser"), + self.tr("eric6 Web Browser"), self.tr( - """<b>eric5 Web Browser - {0}</b>""" - """<p>The eric5 Web Browser is a combined help file and HTML""" - """ browser. It is part of the eric5 development""" + """<b>eric6 Web Browser - {0}</b>""" + """<p>The eric6 Web Browser is a combined help file and HTML""" + """ browser. It is part of the eric6 development""" """ toolset.</p>""" ).format(Version)) @@ -2083,7 +2083,7 @@ """ Private slot to show info about Qt. """ - E5MessageBox.aboutQt(self, self.tr("eric5 Web Browser")) + E5MessageBox.aboutQt(self, self.tr("eric6 Web Browser")) def setBackwardAvailable(self, b): """ @@ -2583,7 +2583,7 @@ if cls._helpEngine is None: cls._helpEngine = \ QHelpEngine(os.path.join(Utilities.getConfigDir(), - "browser", "eric5help.qhc")) + "browser", "eric6help.qhc")) return cls._helpEngine else: return None @@ -2630,7 +2630,7 @@ if not self.__activating: self.__activating = True req = QNetworkRequest(url) - req.setRawHeader("X-Eric5-UserLoadAction", b"1") + req.setRawHeader("X-Eric6-UserLoadAction", b"1") self.currentBrowser().setSource( None, (req, QNetworkAccessManager.GetOperation, b"")) self.__activating = False @@ -2871,7 +2871,7 @@ """ E5MessageBox.warning( self, - self.tr("eric5 Web Browser"), + self.tr("eric6 Web Browser"), message) def __docsInstalled(self, installed): @@ -3204,7 +3204,7 @@ @param title title of the bookmark (string) """ req = QNetworkRequest(url) - req.setRawHeader("X-Eric5-UserLoadAction", b"1") + req.setRawHeader("X-Eric6-UserLoadAction", b"1") self.newTab(None, (req, QNetworkAccessManager.GetOperation, b"")) @classmethod
--- a/Helpviewer/Network/EmptyNetworkReply.py Sat Jul 05 11:41:14 2014 +0200 +++ b/Helpviewer/Network/EmptyNetworkReply.py Sat Jul 05 12:13:23 2014 +0200 @@ -27,7 +27,7 @@ super(EmptyNetworkReply, self).__init__(parent) self.setOperation(QNetworkAccessManager.GetOperation) - self.setError(QNetworkReply.OperationCanceledError, "eric5:No Error") + self.setError(QNetworkReply.OperationCanceledError, "eric6:No Error") QTimer.singleShot(0, lambda: self.finished.emit())
--- a/Helpviewer/Network/NetworkAccessManager.py Sat Jul 05 11:41:14 2014 +0200 +++ b/Helpviewer/Network/NetworkAccessManager.py Sat Jul 05 12:13:23 2014 +0200 @@ -141,8 +141,8 @@ return reply req = QNetworkRequest(request) - if req.rawHeader("X-Eric5-UserLoadAction") == QByteArray("1"): - req.setRawHeader("X-Eric5-UserLoadAction", QByteArray()) + if req.rawHeader("X-Eric6-UserLoadAction") == QByteArray("1"): + req.setRawHeader("X-Eric6-UserLoadAction", QByteArray()) req.setAttribute(QNetworkRequest.User + 200, "") else: req.setAttribute(
--- a/Helpviewer/Sync/SyncCheckPage.py Sat Jul 05 11:41:14 2014 +0200 +++ b/Helpviewer/Sync/SyncCheckPage.py Sat Jul 05 12:13:23 2014 +0200 @@ -22,7 +22,7 @@ import Preferences import UI.PixmapCache -from eric5config import getConfig +from eric6config import getConfig class SyncCheckPage(QWizardPage, Ui_SyncCheckPage):
--- a/Helpviewer/WebPlugins/__init__.py Sat Jul 05 11:41:14 2014 +0200 +++ b/Helpviewer/WebPlugins/__init__.py Sat Jul 05 12:13:23 2014 +0200 @@ -4,5 +4,5 @@ # """ -Package implementing web plug-ins for the eric5 web browser. +Package implementing web plug-ins for the eric6 web browser. """
--- a/Helpviewer/__init__.py Sat Jul 05 11:41:14 2014 +0200 +++ b/Helpviewer/__init__.py Sat Jul 05 12:13:23 2014 +0200 @@ -8,6 +8,6 @@ The web browser is a little HTML browser for the display of HTML help files like the Qt Online Documentation and for browsing the internet. -It may be used as a standalone version as well by using the eric5_helpviewer.py -script found in the main eric5 installation directory. +It may be used as a standalone version as well by using the eric6_helpviewer.py +script found in the main eric6 installation directory. """
--- a/IconEditor/IconEditorWindow.py Sat Jul 05 11:41:14 2014 +0200 +++ b/IconEditor/IconEditorWindow.py Sat Jul 05 12:13:23 2014 +0200 @@ -48,13 +48,13 @@ @param fileName name of a file to load on startup (string) @param parent parent widget of this window (QWidget) @keyparam fromEric flag indicating whether it was called from within - eric5 (boolean) + eric6 (boolean) @keyparam initShortcutsOnly flag indicating to just initialize the keyboard shortcuts (boolean) @keyparam project reference to the project object (Project) """ super(IconEditorWindow, self).__init__(parent) - self.setObjectName("eric5_icon_editor") + self.setObjectName("eric6_icon_editor") self.fromEric = fromEric self.initShortcutsOnly = initShortcutsOnly @@ -1121,14 +1121,14 @@ file = QFile(fileName) if not file.exists(): E5MessageBox.warning( - self, self.tr("eric5 Icon Editor"), + self, self.tr("eric6 Icon Editor"), self.tr("The file '{0}' does not exist.") .format(fileName)) return if not file.open(QFile.ReadOnly): E5MessageBox.warning( - self, self.tr("eric5 Icon Editor"), + self, self.tr("eric6 Icon Editor"), self.tr("Cannot read file '{0}:\n{1}.") .format(fileName, file.errorString())) return @@ -1148,7 +1148,7 @@ file = QFile(fileName) if not file.open(QFile.WriteOnly): E5MessageBox.warning( - self, self.tr("eric5 Icon Editor"), + self, self.tr("eric6 Icon Editor"), self.tr("Cannot write file '{0}:\n{1}.") .format(fileName, file.errorString())) @@ -1162,7 +1162,7 @@ if not res: E5MessageBox.warning( - self, self.tr("eric5 Icon Editor"), + self, self.tr("eric6 Icon Editor"), self.tr("Cannot write file '{0}:\n{1}.") .format(fileName, file.errorString())) @@ -1215,7 +1215,7 @@ if self.__editor.isDirty(): ret = E5MessageBox.okToClearData( self, - self.tr("eric5 Icon Editor"), + self.tr("eric6 Icon Editor"), self.tr("""The icon image has unsaved changes."""), self.__saveIcon) if not ret: @@ -1304,15 +1304,15 @@ Private slot to show a little About message. """ E5MessageBox.about( - self, self.tr("About eric5 Icon Editor"), - self.tr("The eric5 Icon Editor is a simple editor component" + self, self.tr("About eric6 Icon Editor"), + self.tr("The eric6 Icon Editor is a simple editor component" " to perform icon drawing tasks.")) def __aboutQt(self): """ Private slot to handle the About Qt dialog. """ - E5MessageBox.aboutQt(self, "eric5 Icon Editor") + E5MessageBox.aboutQt(self, "eric6 Icon Editor") def __whatsThis(self): """
--- a/MultiProject/__init__.py Sat Jul 05 11:41:14 2014 +0200 +++ b/MultiProject/__init__.py Sat Jul 05 12:13:23 2014 +0200 @@ -4,10 +4,10 @@ # """ -Package implementing the multi project management module of eric5. +Package implementing the multi project management module of eric6. The multi project management module consists of the main part, which is -used for reading and writing of eric5 multi project files (*.e4m) and +used for reading and writing of eric6 multi project files (*.e4m) and for performing all operations on the multi project. It is accompanied by various UI related modules implementing different dialogs and a browser for the display of projects belonging to the current multi project.
--- a/Network/IRC/IrcNetworkManager.py Sat Jul 05 11:41:14 2014 +0200 +++ b/Network/IRC/IrcNetworkManager.py Sat Jul 05 12:13:23 2014 +0200 @@ -30,9 +30,9 @@ DefaultAwayMessage = QCoreApplication.translate( "IrcIdentity", "Gone away for now.") DefaultQuitMessage = QCoreApplication.translate( - "IrcIdentity", "IRC for eric5 IDE") + "IrcIdentity", "IRC for eric6 IDE") DefaultPartMessage = QCoreApplication.translate( - "IrcIdentity", "IRC for eric5 IDE") + "IrcIdentity", "IRC for eric6 IDE") def __init__(self, name): """
--- a/PluginManager/PluginManager.py Sat Jul 05 11:41:14 2014 +0200 +++ b/PluginManager/PluginManager.py Sat Jul 05 12:13:23 2014 +0200 @@ -38,7 +38,7 @@ import Utilities import Preferences -from eric5config import getConfig +from eric6config import getConfig class PluginManager(QObject): @@ -69,10 +69,10 @@ Constructor The Plugin Manager deals with three different plugin directories. - The first is the one, that is part of eric5 (eric5/Plugins). The - second one is the global plugin directory called 'eric5plugins', + The first is the one, that is part of eric6 (eric6/Plugins). The + second one is the global plugin directory called 'eric6plugins', which is located inside the site-packages directory. The last one - is the user plugin directory located inside the .eric5 directory + is the user plugin directory located inside the .eric6 directory of the users home directory. @param parent reference to the parent object (QObject) @@ -91,12 +91,12 @@ self.__inactivePluginsKey = "PluginManager/InactivePlugins" self.pluginDirs = { - "eric5": os.path.join(getConfig('ericDir'), "Plugins"), + "eric6": os.path.join(getConfig('ericDir'), "Plugins"), "global": os.path.join(Utilities.getPythonModulesDirectory(), - "eric5plugins"), - "user": os.path.join(Utilities.getConfigDir(), "eric5plugins"), + "eric6plugins"), + "user": os.path.join(Utilities.getConfigDir(), "eric6plugins"), } - self.__priorityOrder = ["eric5", "global", "user"] + self.__priorityOrder = ["eric6", "global", "user"] self.__defaultDownloadDir = os.path.join( Utilities.getConfigDir(), "Downloads") @@ -218,12 +218,12 @@ del self.pluginDirs["user"] del self.pluginDirs["global"] - if not os.path.exists(self.pluginDirs["eric5"]): + if not os.path.exists(self.pluginDirs["eric6"]): return ( False, self.tr( "The internal plugin directory <b>{0}</b>" - " does not exits.").format(self.pluginDirs["eric5"])) + " does not exits.").format(self.pluginDirs["eric6"])) return (True, "") @@ -238,7 +238,7 @@ return False self.__foundCoreModules = self.getPluginModules( - self.pluginDirs["eric5"]) + self.pluginDirs["eric6"]) if "global" in self.pluginDirs: self.__foundGlobalModules = \ self.getPluginModules(self.pluginDirs["global"]) @@ -303,7 +303,7 @@ if pluginName not in self.__foundGlobalModules and \ pluginName not in self.__foundUserModules and \ pluginName != develPluginName: - self.loadPlugin(pluginName, self.pluginDirs["eric5"]) + self.loadPlugin(pluginName, self.pluginDirs["eric6"]) for pluginName in self.__foundGlobalModules: # user plugins have priority @@ -369,8 +369,8 @@ raise PluginLoadError(name) else: self.__onDemandInactiveModules[name] = module - module.eric5PluginModuleName = name - module.eric5PluginModuleFilename = fname + module.eric6PluginModuleName = name + module.eric6PluginModuleFilename = fname self.__modulesCount += 1 if reload_: imp.reload(module) @@ -469,16 +469,16 @@ return if not self.__canActivatePlugin(module): - raise PluginActivationError(module.eric5PluginModuleName) + raise PluginActivationError(module.eric6PluginModuleName) version = getattr(module, "version") className = getattr(module, "className") pluginClass = getattr(module, className) pluginObject = None if name not in self.__onDemandInactivePlugins: pluginObject = pluginClass(self.__ui) - pluginObject.eric5PluginModule = module - pluginObject.eric5PluginName = className - pluginObject.eric5PluginVersion = version + pluginObject.eric6PluginModule = module + pluginObject.eric6PluginName = className + pluginObject.eric6PluginVersion = version self.__onDemandInactivePlugins[name] = pluginObject except PluginActivationError: return @@ -521,7 +521,7 @@ return None if not self.__canActivatePlugin(module): - raise PluginActivationError(module.eric5PluginModuleName) + raise PluginActivationError(module.eric6PluginModuleName) version = getattr(module, "version") className = getattr(module, "className") pluginClass = getattr(module, className) @@ -548,9 +548,9 @@ return None self.pluginActivated.emit(name, pluginObject) - pluginObject.eric5PluginModule = module - pluginObject.eric5PluginName = className - pluginObject.eric5PluginVersion = version + pluginObject.eric6PluginModule = module + pluginObject.eric6PluginName = className + pluginObject.eric6PluginVersion = version if onDemand: self.__onDemandInactiveModules.pop(name) @@ -587,26 +587,26 @@ try: if not hasattr(module, "version"): raise PluginModuleFormatError( - module.eric5PluginModuleName, "version") + module.eric6PluginModuleName, "version") if not hasattr(module, "className"): raise PluginModuleFormatError( - module.eric5PluginModuleName, "className") + module.eric6PluginModuleName, "className") className = getattr(module, "className") if not hasattr(module, className): raise PluginModuleFormatError( - module.eric5PluginModuleName, className) + module.eric6PluginModuleName, className) pluginClass = getattr(module, className) if not hasattr(pluginClass, "__init__"): raise PluginClassFormatError( - module.eric5PluginModuleName, + module.eric6PluginModuleName, className, "__init__") if not hasattr(pluginClass, "activate"): raise PluginClassFormatError( - module.eric5PluginModuleName, + module.eric6PluginModuleName, className, "activate") if not hasattr(pluginClass, "deactivate"): raise PluginClassFormatError( - module.eric5PluginModuleName, + module.eric6PluginModuleName, className, "deactivate") return True except PluginModuleFormatError as e: @@ -777,7 +777,7 @@ details["moduleName"] = name details["moduleFileName"] = getattr( - module, "eric5PluginModuleFilename", "") + module, "eric6PluginModuleFilename", "") details["pluginName"] = getattr(module, "name", "") details["version"] = getattr(module, "version", "") details["author"] = getattr(module, "author", "")
--- a/PluginManager/PluginRepositoryDialog.py Sat Jul 05 11:41:14 2014 +0200 +++ b/PluginManager/PluginRepositoryDialog.py Sat Jul 05 12:13:23 2014 +0200 @@ -40,7 +40,7 @@ import UI.PixmapCache -from eric5config import getConfig +from eric6config import getConfig class PluginRepositoryWidget(QWidget, Ui_PluginRepositoryDialog): @@ -791,10 +791,10 @@ def __startPluginInstall(self): """ - Private slot to start the eric5 plugin installation dialog. + Private slot to start the eric6 plugin installation dialog. """ proc = QProcess() - applPath = os.path.join(getConfig("ericDir"), "eric5_plugininstall.py") + applPath = os.path.join(getConfig("ericDir"), "eric6_plugininstall.py") args = [] args.append(applPath)
--- a/Plugins/AboutPlugin/AboutDialog.py Sat Jul 05 11:41:14 2014 +0200 +++ b/Plugins/AboutPlugin/AboutDialog.py Sat Jul 05 12:13:23 2014 +0200 @@ -94,7 +94,7 @@ Stefan Jaensch Martin v. Löwis Thorsten Kohnhorst -for providing patches to improve eric3, eric4 and eric5. +for providing patches to improve eric3, eric4, eric5 and eric6. And all the people who reported bugs and made suggestions."""
--- a/Plugins/CheckerPlugins/CodeStyleChecker/pep8.py Sat Jul 05 11:41:14 2014 +0200 +++ b/Plugins/CheckerPlugins/CodeStyleChecker/pep8.py Sat Jul 05 12:13:23 2014 +0200 @@ -50,11 +50,11 @@ # # This is a modified version to make the original pep8.py better suitable -# for being called from within the eric5 IDE. The modifications are as +# for being called from within the eric6 IDE. The modifications are as # follows: # # - made messages translatable via Qt -# - added code for eric5 integration +# - added code for eric6 integration # # Copyright (c) 2011 - 2014 Detlev Offenbach <detlev@die-offenbachs.de> # @@ -1261,7 +1261,7 @@ self.report_error = self.report.error self.report_error_args = self.report.error_args - # added for eric5 integration + # added for eric6 integration self.options = options def report_invalid_syntax(self): @@ -1377,7 +1377,7 @@ except (SyntaxError, TypeError): return self.report_invalid_syntax() for name, cls, __ in self._ast_checks: - # extended API for eric5 integration + # extended API for eric6 integration checker = cls(tree, self.filename, self.options) for args in checker.run(): lineno = args[0]
--- a/Plugins/CheckerPlugins/SyntaxChecker/pyflakes/checker.py Sat Jul 05 11:41:14 2014 +0200 +++ b/Plugins/CheckerPlugins/SyntaxChecker/pyflakes/checker.py Sat Jul 05 12:13:23 2014 +0200 @@ -4,7 +4,7 @@ # # Original (c) 2005-2010 Divmod, Inc. # -# This module is based on pyflakes but was modified to work with eric5 +# This module is based on pyflakes but was modified to work with eric6 """ Main module.
--- a/Plugins/CheckerPlugins/SyntaxChecker/pyflakes/messages.py Sat Jul 05 11:41:14 2014 +0200 +++ b/Plugins/CheckerPlugins/SyntaxChecker/pyflakes/messages.py Sat Jul 05 12:13:23 2014 +0200 @@ -5,7 +5,7 @@ # Original (c) 2005 Divmod, Inc. See __init__.py file for details # # This module is based on pyflakes for Python2 and Python3, but was modified to -# be integrated into eric5 +# be integrated into eric6 """ Module providing the class Message and its subclasses.
--- a/Plugins/CheckerPlugins/Tabnanny/Tabnanny.py Sat Jul 05 11:41:14 2014 +0200 +++ b/Plugins/CheckerPlugins/Tabnanny/Tabnanny.py Sat Jul 05 12:13:23 2014 +0200 @@ -13,7 +13,7 @@ releases; such changes may not be backward compatible. This is a modified version to make the original tabnanny better suitable -for being called from within the eric5 IDE. +for being called from within the eric6 IDE. @exception ValueError The tokenize module is too old. """ @@ -28,7 +28,7 @@ # # This is a modified version to make the original tabnanny better suitable -# for being called from within the eric5 IDE. The modifications are as +# for being called from within the eric6 IDE. The modifications are as # follows: # # - there is no main function anymore
--- a/Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py Sat Jul 05 11:41:14 2014 +0200 +++ b/Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py Sat Jul 05 12:13:23 2014 +0200 @@ -4,7 +4,7 @@ # """ -Module implementing a dialog to enter the parameters for eric5_api. +Module implementing a dialog to enter the parameters for eric6_api. """ from __future__ import unicode_literals @@ -24,12 +24,12 @@ import UI.PixmapCache import DocumentationTools -from eric5config import getConfig +from eric6config import getConfig class EricapiConfigDialog(QDialog, Ui_EricapiConfigDialog): """ - Class implementing a dialog to enter the parameters for eric5_api. + Class implementing a dialog to enter the parameters for eric6_api. """ def __init__(self, project, parms=None, parent=None): """ @@ -130,7 +130,7 @@ # 1. the program name args.append(sys.executable) args.append( - Utilities.normabsjoinpath(getConfig('ericDir'), "eric5_api.py")) + Utilities.normabsjoinpath(getConfig('ericDir'), "eric6_api.py")) # 2. the commandline options if self.parameters['outputFile'] != self.defaults['outputFile']:
--- a/Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py Sat Jul 05 11:41:14 2014 +0200 +++ b/Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py Sat Jul 05 12:13:23 2014 +0200 @@ -4,7 +4,7 @@ # """ -Module implementing a dialog to enter the parameters for eric5_doc. +Module implementing a dialog to enter the parameters for eric6_doc. """ from __future__ import unicode_literals @@ -21,17 +21,17 @@ from E5Gui import E5FileDialog from .Ui_EricdocConfigDialog import Ui_EricdocConfigDialog -from DocumentationTools.Config import eric5docDefaultColors, \ - eric5docColorParameterNames +from DocumentationTools.Config import eric6docDefaultColors, \ + eric6docColorParameterNames import Utilities import UI.PixmapCache -from eric5config import getConfig +from eric6config import getConfig class EricdocConfigDialog(QDialog, Ui_EricdocConfigDialog): """ - Class implementing a dialog to enter the parameters for eric5_doc. + Class implementing a dialog to enter the parameters for eric6_doc. """ def __init__(self, project, parms=None, parent=None): """ @@ -77,7 +77,7 @@ # get a copy of the defaults to store the user settings self.parameters = copy.deepcopy(self.defaults) - self.colors = eric5docDefaultColors.copy() + self.colors = eric6docDefaultColors.copy() # combine it with the values of parms if parms is not None: @@ -175,7 +175,7 @@ # 1. the program name args.append(sys.executable) args.append( - Utilities.normabsjoinpath(getConfig('ericDir'), "eric5_doc.py")) + Utilities.normabsjoinpath(getConfig('ericDir'), "eric6_doc.py")) # 2. the commandline options # 2a. general commandline options @@ -233,10 +233,10 @@ args.append( os.path.join(self.ppath, self.parameters['cssFile'])) for key, value in list(self.colors.items()): - if self.colors[key] != eric5docDefaultColors[key]: + if self.colors[key] != eric6docDefaultColors[key]: parms[key] = self.colors[key] args.append("--{0}={1}".format( - eric5docColorParameterNames[key], self.colors[key])) + eric6docColorParameterNames[key], self.colors[key])) # 2c. QtHelp commandline options parms['qtHelpEnabled'] = self.parameters['qtHelpEnabled']
--- a/Plugins/PluginCodeStyleChecker.py Sat Jul 05 11:41:14 2014 +0200 +++ b/Plugins/PluginCodeStyleChecker.py Sat Jul 05 12:13:23 2014 +0200 @@ -34,7 +34,7 @@ """ files for compliance to the code style conventions given in PEP-8.""" \ """ A PEP-257 checker is used to check Python source files for""" \ """ compliance to docstring conventions given in PEP-257 and an""" \ - """ eric5 variant is used to check against eric conventions.""" + """ eric6 variant is used to check against eric conventions.""" pyqtApi = 2 python2Compatible = True # End-Of-Header
--- a/Plugins/PluginEricapi.py Sat Jul 05 11:41:14 2014 +0200 +++ b/Plugins/PluginEricapi.py Sat Jul 05 12:13:23 2014 +0200 @@ -20,7 +20,7 @@ import Utilities -from eric5config import getConfig +from eric6config import getConfig # Start-Of-Header name = "Ericapi Plugin" @@ -48,17 +48,17 @@ @return dictionary containing the data to query the presence of the executable """ - exe = 'eric5_api' + exe = 'eric6_api' if Utilities.isWindowsPlatform(): exe = os.path.join(getConfig("bindir"), exe + '.bat') data = { "programEntry": True, "header": QCoreApplication.translate( - "EricapiPlugin", "Eric5 API File Generator"), + "EricapiPlugin", "Eric6 API File Generator"), "exe": exe, "versionCommand": '--version', - "versionStartsWith": 'eric5_', + "versionStartsWith": 'eric6_', "versionPosition": -3, "version": "", "versionCleanup": None, @@ -96,14 +96,14 @@ menu = e5App().getObject("Project").getMenu("Apidoc") if menu: self.__projectAct = E5Action( - self.tr('Generate API file (eric5_api)'), - self.tr('Generate &API file (eric5_api)'), 0, 0, - self, 'doc_eric5_api') + self.tr('Generate API file (eric6_api)'), + self.tr('Generate &API file (eric6_api)'), 0, 0, + self, 'doc_eric6_api') self.__projectAct.setStatusTip(self.tr( - 'Generate an API file using eric5_api')) + 'Generate an API file using eric6_api')) self.__projectAct.setWhatsThis(self.tr( """<b>Generate API file</b>""" - """<p>Generate an API file using eric5_api.</p>""" + """<p>Generate an API file using eric6_api.</p>""" )) self.__projectAct.triggered.connect(self.__doEricapi) e5App().getObject("Project").addE5Actions([self.__projectAct]) @@ -142,7 +142,7 @@ def __doEricapi(self): """ - Private slot to perform the eric5_api api generation. + Private slot to perform the eric6_api api generation. """ from DocumentationPlugins.Ericapi.EricapiConfigDialog import \ EricapiConfigDialog
--- a/Plugins/PluginEricdoc.py Sat Jul 05 11:41:14 2014 +0200 +++ b/Plugins/PluginEricdoc.py Sat Jul 05 12:13:23 2014 +0200 @@ -20,7 +20,7 @@ import Utilities -from eric5config import getConfig +from eric6config import getConfig # Start-Of-Header name = "Ericdoc Plugin" @@ -50,17 +50,17 @@ """ dataList = [] - # 1. eric5_doc - exe = 'eric5_doc' + # 1. eric6_doc + exe = 'eric6_doc' if Utilities.isWindowsPlatform(): exe = os.path.join(getConfig("bindir"), exe + '.bat') dataList.append({ "programEntry": True, "header": QCoreApplication.translate( - "EricdocPlugin", "Eric5 Documentation Generator"), + "EricdocPlugin", "Eric6 Documentation Generator"), "exe": exe, "versionCommand": '--version', - "versionStartsWith": 'eric5_', + "versionStartsWith": 'eric6_', "versionPosition": -3, "version": "", "versionCleanup": None, @@ -131,14 +131,14 @@ if menu: self.__projectAct = \ E5Action( - self.tr('Generate documentation (eric5_doc)'), - self.tr('Generate &documentation (eric5_doc)'), 0, 0, - self, 'doc_eric5_doc') + self.tr('Generate documentation (eric6_doc)'), + self.tr('Generate &documentation (eric6_doc)'), 0, 0, + self, 'doc_eric6_doc') self.__projectAct.setStatusTip( - self.tr('Generate API documentation using eric5_doc')) + self.tr('Generate API documentation using eric6_doc')) self.__projectAct.setWhatsThis(self.tr( """<b>Generate documentation</b>""" - """<p>Generate API documentation using eric5_doc.</p>""" + """<p>Generate API documentation using eric6_doc.</p>""" )) self.__projectAct.triggered.connect(self.__doEricdoc) e5App().getObject("Project").addE5Actions([self.__projectAct]) @@ -177,7 +177,7 @@ def __doEricdoc(self): """ - Private slot to perform the eric5_doc api documentation generation. + Private slot to perform the eric6_doc api documentation generation. """ from DocumentationPlugins.Ericdoc.EricdocConfigDialog import \ EricdocConfigDialog @@ -208,7 +208,7 @@ outdir = Utilities.toNativeSeparators(parms['outputDirectory']) if outdir == '': - outdir = 'doc' # that is eric5_docs default output dir + outdir = 'doc' # that is eric6_docs default output dir # add it to the project data, if it isn't in already outdir = project.getRelativePath(outdir) @@ -222,7 +222,7 @@ parms['qtHelpOutputDirectory']) if outdir == '': outdir = 'help' - # that is eric5_docs default QtHelp output dir + # that is eric6_docs default QtHelp output dir # add it to the project data, if it isn't in already outdir = project.getRelativePath(outdir)
--- a/Plugins/PluginSyntaxChecker.py Sat Jul 05 11:41:14 2014 +0200 +++ b/Plugins/PluginSyntaxChecker.py Sat Jul 05 12:13:23 2014 +0200 @@ -15,7 +15,7 @@ from E5Gui.E5Action import E5Action from E5Gui.E5Application import e5App -from eric5config import getConfig +from eric6config import getConfig from Project.ProjectBrowserModel import ProjectBrowserFileItem
--- a/Plugins/VcsPlugins/vcsMercurial/hg.py Sat Jul 05 11:41:14 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/hg.py Sat Jul 05 12:13:23 2014 +0200 @@ -2479,6 +2479,8 @@ """ status = False ignorePatterns = [ + "glob:.eric6project", + "glob:_eric6project", "glob:.eric5project", "glob:_eric5project", "glob:.eric4project",
--- a/Plugins/VcsPlugins/vcsPySvn/Config.py Sat Jul 05 11:41:14 2014 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/Config.py Sat Jul 05 12:13:23 2014 +0200 @@ -119,8 +119,8 @@ "global-ignores = *.o *.lo *.la *.al .libs *.so *.so.[0-9]* *.a *.pyc", " *.pyo .*.rej *.rej .*~ *~ #*# .#* .*.swp .DS_Store", " *.orig *.bak cur tmp __pycache__ .directory", - " .ropeproject .eric4project .eric5project", - " _ropeproject _eric4project _eric5project", + " .ropeproject .eric4project .eric5project .eric6project", + " _ropeproject _eric4project _eric5project _eric6project", "### Set log-encoding to the default encoding for log messages", "# log-encoding = latin1", "### Set use-commit-times to make checkout/update/switch/revert", @@ -184,7 +184,9 @@ ".ropeproject", ".eric4project", ".eric5project", + ".eric6project", "_ropeproject", "_eric4project", "_eric5project", + "_eric6project", ]
--- a/Plugins/VcsPlugins/vcsPySvn/subversion.py Sat Jul 05 11:41:14 2014 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/subversion.py Sat Jul 05 12:13:23 2014 +0200 @@ -180,7 +180,7 @@ """ Public method used to initialize the subversion repository. - The subversion repository has to be initialized from outside eric5 + The subversion repository has to be initialized from outside eric6 because the respective command always works locally. Therefore we always return TRUE without doing anything.
--- a/Plugins/VcsPlugins/vcsSubversion/Config.py Sat Jul 05 11:41:14 2014 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/Config.py Sat Jul 05 12:13:23 2014 +0200 @@ -119,8 +119,8 @@ "global-ignores = *.o *.lo *.la *.al .libs *.so *.so.[0-9]* *.a *.pyc", " *.pyo .*.rej *.rej .*~ *~ #*# .#* .*.swp .DS_Store", " *.orig *.bak cur tmp __pycache__ .directory", - " .ropeproject .eric4project .eric5project", - " _ropeproject _eric4project _eric5project", + " .ropeproject .eric4project .eric5project .eric6project", + " _ropeproject _eric4project _eric5project _eric5project", "### Set log-encoding to the default encoding for log messages", "# log-encoding = latin1", "### Set use-commit-times to make checkout/update/switch/revert", @@ -184,7 +184,9 @@ ".ropeproject", ".eric4project", ".eric5project", + ".eric6project", "_ropeproject", "_eric4project", "_eric5project", + "_eric6project", ]
--- a/Plugins/VcsPlugins/vcsSubversion/subversion.py Sat Jul 05 11:41:14 2014 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/subversion.py Sat Jul 05 12:13:23 2014 +0200 @@ -193,7 +193,7 @@ """ Public method used to initialize the subversion repository. - The subversion repository has to be initialized from outside eric5 + The subversion repository has to be initialized from outside eric6 because the respective command always works locally. Therefore we always return TRUE without doing anything.
--- a/Plugins/ViewManagerPlugins/Tabview/Tabview.py Sat Jul 05 11:41:14 2014 +0200 +++ b/Plugins/ViewManagerPlugins/Tabview/Tabview.py Sat Jul 05 12:13:23 2014 +0200 @@ -32,7 +32,7 @@ import Preferences from Globals import isMacPlatform -from eric5config import getConfig +from eric6config import getConfig class TabBar(E5WheelTabBar):
--- a/Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py Sat Jul 05 11:41:14 2014 +0200 +++ b/Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py Sat Jul 05 12:13:23 2014 +0200 @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """ -Module implementing the eric5 message box wizard dialog. +Module implementing the eric6 message box wizard dialog. """ from __future__ import unicode_literals @@ -18,7 +18,7 @@ class E5MessageBoxWizardDialog(QDialog, Ui_E5MessageBoxWizardDialog): """ - Class implementing the eric5 message box wizard dialog. + Class implementing the eric6 message box wizard dialog. It displays a dialog for entering the parameters for the E5MessageBox code generator.
--- a/Plugins/WizardPlugins/E5MessageBoxWizard/__init__.py Sat Jul 05 11:41:14 2014 +0200 +++ b/Plugins/WizardPlugins/E5MessageBoxWizard/__init__.py Sat Jul 05 12:13:23 2014 +0200 @@ -4,5 +4,5 @@ # """ -Package implementing the eric5 message box wizard. +Package implementing the eric6 message box wizard. """
--- a/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.py Sat Jul 05 11:41:14 2014 +0200 +++ b/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.py Sat Jul 05 12:13:23 2014 +0200 @@ -37,7 +37,7 @@ Constructor @param parent parent widget (QWidget) - @param fromEric flag indicating a call from within eric5 + @param fromEric flag indicating a call from within eric6 """ super(PyRegExpWizardWidget, self).__init__(parent) self.setupUi(self) @@ -382,7 +382,7 @@ """ Private slot to copy the regexp string into the clipboard. - This slot is only available, if not called from within eric5. + This slot is only available, if not called from within eric6. """ escaped = self.regexpTextEdit.toPlainText() if escaped: @@ -693,7 +693,7 @@ Constructor @param parent parent widget (QWidget) - @param fromEric flag indicating a call from within eric5 + @param fromEric flag indicating a call from within eric6 """ super(PyRegExpWizardDialog, self).__init__(parent) self.setModal(fromEric)
--- a/Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.py Sat Jul 05 11:41:14 2014 +0200 +++ b/Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.py Sat Jul 05 12:13:23 2014 +0200 @@ -36,7 +36,7 @@ Constructor @param parent parent widget (QWidget) - @param fromEric flag indicating a call from within eric5 + @param fromEric flag indicating a call from within eric6 """ super(QRegExpWizardWidget, self).__init__(parent) self.setupUi(self) @@ -411,7 +411,7 @@ """ Private slot to copy the regexp string into the clipboard. - This slot is only available, if not called from within eric5. + This slot is only available, if not called from within eric6. """ escaped = self.regexpLineEdit.text() if escaped: @@ -666,7 +666,7 @@ Constructor @param parent parent widget (QWidget) - @param fromEric flag indicating a call from within eric5 + @param fromEric flag indicating a call from within eric6 """ super(QRegExpWizardDialog, self).__init__(parent) self.setModal(fromEric)
--- a/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.py Sat Jul 05 11:41:14 2014 +0200 +++ b/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.py Sat Jul 05 12:13:23 2014 +0200 @@ -41,7 +41,7 @@ Constructor @param parent parent widget (QWidget) - @param fromEric flag indicating a call from within eric5 + @param fromEric flag indicating a call from within eric6 """ super(QRegularExpressionWizardWidget, self).__init__(parent) self.setupUi(self) @@ -462,7 +462,7 @@ """ Private slot to copy the QRegularExpression string into the clipboard. - This slot is only available, if not called from within eric5. + This slot is only available, if not called from within eric6. """ escaped = self.regexpTextEdit.toPlainText() if escaped: @@ -781,7 +781,7 @@ Constructor @param parent parent widget (QWidget) - @param fromEric flag indicating a call from within eric5 + @param fromEric flag indicating a call from within eric6 """ super(QRegularExpressionWizardDialog, self).__init__(parent) self.setModal(fromEric)
--- a/Preferences/ConfigurationDialog.py Sat Jul 05 11:41:14 2014 +0200 +++ b/Preferences/ConfigurationDialog.py Sat Jul 05 12:13:23 2014 +0200 @@ -4,7 +4,7 @@ # """ -Module implementing a dialog for the configuration of eric5. +Module implementing a dialog for the configuration of eric6. """ from __future__ import unicode_literals @@ -29,7 +29,7 @@ import UI.PixmapCache -from eric5config import getConfig +from eric6config import getConfig class ConfigurationPageItem(QTreeWidgetItem): @@ -62,7 +62,7 @@ class ConfigurationWidget(QWidget): """ - Class implementing a dialog for the configuration of eric5. + Class implementing a dialog for the configuration of eric6. @signal preferencesChanged() emitted after settings have been changed @signal masterPasswordChanged(str, str) emitted after the master @@ -85,7 +85,7 @@ @param parent The parent widget of this dialog. (QWidget) @keyparam fromEric flag indicating a dialog generation from within the - eric5 ide (boolean) + eric6 ide (boolean) @keyparam displayMode mode of the configuration dialog (DefaultMode, HelpBrowserMode, TrayStarterMode) @exception RuntimeError raised to indicate an invalid dialog mode @@ -281,7 +281,7 @@ [self.tr("VirusTotal Interface"), "virustotal.png", "HelpVirusTotalPage", "0helpPage", None], "helpWebBrowserPage": - [self.tr("eric5 Web Browser"), "ericWeb.png", + [self.tr("eric6 Web Browser"), "ericWeb.png", "HelpWebBrowserPage", "0helpPage", None], "0projectPage": @@ -346,7 +346,7 @@ [self.tr("VirusTotal Interface"), "virustotal.png", "HelpVirusTotalPage", "0helpPage", None], "helpWebBrowserPage": - [self.tr("eric5 Web Browser"), "ericWeb.png", + [self.tr("eric6 Web Browser"), "ericWeb.png", "HelpWebBrowserPage", "0helpPage", None], } elif displayMode == ConfigurationWidget.TrayStarterMode: @@ -764,7 +764,7 @@ @param name The name of this dialog. string @param modal Flag indicating a modal dialog. (boolean) @keyparam fromEric flag indicating a dialog generation from within the - eric5 ide (boolean) + eric6 ide (boolean) @keyparam displayMode mode of the configuration dialog (DefaultMode, HelpBrowserMode, TrayStarterMode) """
--- a/Preferences/ConfigurationPages/DebuggerPython3Page.ui Sat Jul 05 11:41:14 2014 +0200 +++ b/Preferences/ConfigurationPages/DebuggerPython3Page.ui Sat Jul 05 12:13:23 2014 +0200 @@ -142,7 +142,7 @@ <item> <widget class="QCheckBox" name="pyRedirectCheckBox"> <property name="toolTip"> - <string>Select, to redirect stdin, stdout and stderr of the program being debugged to the eric5 IDE</string> + <string>Select, to redirect stdin, stdout and stderr of the program being debugged to the eric6 IDE</string> </property> <property name="text"> <string>Redirect stdin/stdout/stderr</string>
--- a/Preferences/ConfigurationPages/DebuggerPythonPage.ui Sat Jul 05 11:41:14 2014 +0200 +++ b/Preferences/ConfigurationPages/DebuggerPythonPage.ui Sat Jul 05 12:13:23 2014 +0200 @@ -142,7 +142,7 @@ <item> <widget class="QCheckBox" name="pyRedirectCheckBox"> <property name="toolTip"> - <string>Select, to redirect stdin, stdout and stderr of the program being debugged to the eric5 IDE</string> + <string>Select, to redirect stdin, stdout and stderr of the program being debugged to the eric6 IDE</string> </property> <property name="text"> <string>Redirect stdin/stdout/stderr</string>
--- a/Preferences/ConfigurationPages/DebuggerRubyPage.ui Sat Jul 05 11:41:14 2014 +0200 +++ b/Preferences/ConfigurationPages/DebuggerRubyPage.ui Sat Jul 05 12:13:23 2014 +0200 @@ -57,7 +57,7 @@ <item> <widget class="QCheckBox" name="rbRedirectCheckBox"> <property name="toolTip"> - <string>Select, to redirect stdin, stdout and stderr of the program being debugged to the eric5 IDE</string> + <string>Select, to redirect stdin, stdout and stderr of the program being debugged to the eric6 IDE</string> </property> <property name="text"> <string>Redirect stdin/stdout/stderr</string>
--- a/Preferences/ConfigurationPages/InterfacePage.py Sat Jul 05 11:41:14 2014 +0200 +++ b/Preferences/ConfigurationPages/InterfacePage.py Sat Jul 05 12:13:23 2014 +0200 @@ -25,7 +25,7 @@ import Utilities import UI.PixmapCache -from eric5config import getConfig +from eric6config import getConfig class InterfacePage(ConfigurationPageBase, Ui_InterfacePage): @@ -225,10 +225,10 @@ """ self.languageComboBox.clear() - fnlist = glob.glob("eric5_*.qm") + \ + fnlist = glob.glob("eric6_*.qm") + \ glob.glob(os.path.join( - getConfig('ericTranslationsDir'), "eric5_*.qm")) + \ - glob.glob(os.path.join(Utilities.getConfigDir(), "eric5_*.qm")) + getConfig('ericTranslationsDir'), "eric6_*.qm")) + \ + glob.glob(os.path.join(Utilities.getConfigDir(), "eric6_*.qm")) locales = {} for fn in fnlist: locale = os.path.basename(fn)[6:-3]
--- a/Preferences/ShortcutsDialog.py Sat Jul 05 11:41:14 2014 +0200 +++ b/Preferences/ShortcutsDialog.py Sat Jul 05 12:13:23 2014 +0200 @@ -4,7 +4,7 @@ # """ -Module implementing a dialog for the configuration of eric5's keyboard +Module implementing a dialog for the configuration of eric6's keyboard shortcuts. """ @@ -25,7 +25,7 @@ class ShortcutsDialog(QDialog, Ui_ShortcutsDialog): """ - Class implementing a dialog for the configuration of eric5's keyboard + Class implementing a dialog for the configuration of eric6's keyboard shortcuts. @signal updateShortcuts() emitted when the user pressed the dialogs OK @@ -188,7 +188,7 @@ self.pluginCategoryItems.append(categoryItem) self.helpViewerItem = self.__generateCategoryItem( - self.tr("eric5 Web Browser")) + self.tr("eric6 Web Browser")) for act in e5App().getObject("DummyHelpViewer").getActions(): self.__generateShortcutItem(self.helpViewerItem, act, True)
--- a/Preferences/__init__.py Sat Jul 05 11:41:14 2014 +0200 +++ b/Preferences/__init__.py Sat Jul 05 12:13:23 2014 +0200 @@ -8,7 +8,7 @@ The preferences interface consists of a class, which defines the default values for all configuration items and stores the actual values. These -values are read and written to the eric5 preferences file by module +values are read and written to the eric6 preferences file by module functions. The data is stored in a file in a subdirectory of the users home directory. The individual configuration data is accessed by accessor functions defined on the module level. The module is simply imported wherever it is @@ -131,7 +131,6 @@ "ShowFilePreview": True, "ShowFilePreviewJS": True, "ShowFilePreviewSSI": True, - # ViewProfiles is obsolete (used till Eric5.3) "ViewProfiles2": { "edit": [ # saved state main window with toolbox windows (0) @@ -1132,7 +1131,7 @@ if not isWindowsPlatform(): hp = QDir.homePath() dn = QDir(hp) - dn.mkdir(".eric5") + dn.mkdir(".eric6") QCoreApplication.setOrganizationName(settingsNameOrganization) QCoreApplication.setApplicationName(settingsNameGlobal)
--- a/Project/CreateDialogCodeDialog.py Sat Jul 05 11:41:14 2014 +0200 +++ b/Project/CreateDialogCodeDialog.py Sat Jul 05 12:13:23 2014 +0200 @@ -24,7 +24,7 @@ from .Ui_CreateDialogCodeDialog import Ui_CreateDialogCodeDialog from .NewDialogClassDialog import NewDialogClassDialog -from eric5config import getConfig +from eric6config import getConfig pyqtSignatureRole = Qt.UserRole + 1 pythonSignatureRole = Qt.UserRole + 2
--- a/Project/DebuggerPropertiesDialog.py Sat Jul 05 11:41:14 2014 +0200 +++ b/Project/DebuggerPropertiesDialog.py Sat Jul 05 12:13:23 2014 +0200 @@ -23,7 +23,7 @@ import Utilities import UI.PixmapCache -from eric5config import getConfig +from eric6config import getConfig class DebuggerPropertiesDialog(QDialog, Ui_DebuggerPropertiesDialog):
--- a/Project/DebuggerPropertiesDialog.ui Sat Jul 05 11:41:14 2014 +0200 +++ b/Project/DebuggerPropertiesDialog.ui Sat Jul 05 12:13:23 2014 +0200 @@ -231,7 +231,7 @@ <item> <widget class="QCheckBox" name="redirectCheckBox"> <property name="toolTip"> - <string>Select to redirect stdin, stdout and stderr of the program being debugged to the eric5 IDE</string> + <string>Select to redirect stdin, stdout and stderr of the program being debugged to the eric6 IDE</string> </property> <property name="text"> <string>Redirect stdin/stdout/stderr</string>
--- a/Project/Project.py Sat Jul 05 11:41:14 2014 +0200 +++ b/Project/Project.py Sat Jul 05 12:13:23 2014 +0200 @@ -3127,9 +3127,9 @@ @return path of the management directory (string) """ if Utilities.isWindowsPlatform(): - return os.path.join(self.ppath, "_eric5project") + return os.path.join(self.ppath, "_eric6project") else: - return os.path.join(self.ppath, ".eric5project") + return os.path.join(self.ppath, ".eric6project") def createProjectManagementDir(self): """ @@ -3706,11 +3706,11 @@ self.tr('Create &Package List'), 0, 0, self.pluginGrp, 'project_plugin_pkglist') self.pluginPkgListAct.setStatusTip( - self.tr('Create an initial PKGLIST file for an eric5 plugin.')) + self.tr('Create an initial PKGLIST file for an eric6 plugin.')) self.pluginPkgListAct.setWhatsThis(self.tr( """<b>Create Package List</b>""" """<p>This creates an initial list of files to include in an""" - """ eric5 plugin archive. The list is created from the project""" + """ eric6 plugin archive. The list is created from the project""" """ file.</p>""" )) self.pluginPkgListAct.triggered.connect(self.__pluginCreatePkgList) @@ -3722,10 +3722,10 @@ self.tr('Create Plugin &Archive'), 0, 0, self.pluginGrp, 'project_plugin_archive') self.pluginArchiveAct.setStatusTip( - self.tr('Create an eric5 plugin archive file.')) + self.tr('Create an eric6 plugin archive file.')) self.pluginArchiveAct.setWhatsThis(self.tr( """<b>Create Plugin Archive</b>""" - """<p>This creates an eric5 plugin archive file using the list""" + """<p>This creates an eric6 plugin archive file using the list""" """ of files given in the PKGLIST file. The archive name is""" """ built from the main script name.</p>""" )) @@ -3738,10 +3738,10 @@ self.tr('Create Plugin Archive (&Snapshot)'), 0, 0, self.pluginGrp, 'project_plugin_sarchive') self.pluginSArchiveAct.setStatusTip(self.tr( - 'Create an eric5 plugin archive file (snapshot release).')) + 'Create an eric6 plugin archive file (snapshot release).')) self.pluginSArchiveAct.setWhatsThis(self.tr( """<b>Create Plugin Archive (Snapshot)</b>""" - """<p>This creates an eric5 plugin archive file using the list""" + """<p>This creates an eric6 plugin archive file using the list""" """ of files given in the PKGLIST file. The archive name is""" """ built from the main script name. The version entry of the""" """ main script is modified to reflect a snapshot release.</p>""" @@ -4634,7 +4634,7 @@ @pyqtSlot() def __pluginCreateArchive(self, snapshot=False): """ - Private slot to create an eric5 plugin archive. + Private slot to create an eric6 plugin archive. @param snapshot flag indicating a snapshot archive (boolean) """ @@ -4680,7 +4680,7 @@ self.ui, self.tr("Create Plugin Archive"), self.tr( - """<p>The eric5 plugin archive file <b>{0}</b> could """ + """<p>The eric6 plugin archive file <b>{0}</b> could """ """not be created.</p>""" """<p>Reason: {1}</p>""").format(archive, str(why))) return @@ -4721,7 +4721,7 @@ UI.PixmapCache.getPixmap("pluginArchive48.png"), self.tr("Create Plugin Archive"), self.tr( - """<p>The eric5 plugin archive file <b>{0}</b> was """ + """<p>The eric6 plugin archive file <b>{0}</b> was """ """created successfully.</p>""") .format(os.path.basename(archive))) else: @@ -4729,12 +4729,12 @@ self.ui, self.tr("Create Plugin Archive"), self.tr( - """<p>The eric5 plugin archive file <b>{0}</b> was """ + """<p>The eric6 plugin archive file <b>{0}</b> was """ """created successfully.</p>""").format(archive)) def __pluginCreateSnapshotArchive(self): """ - Private slot to create an eric5 plugin archive snapshot release. + Private slot to create an eric6 plugin archive snapshot release. """ self.__pluginCreateArchive(True)
--- a/Project/ProjectBrowser.py Sat Jul 05 11:41:14 2014 +0200 +++ b/Project/ProjectBrowser.py Sat Jul 05 12:13:23 2014 +0200 @@ -4,7 +4,7 @@ # """ -Module implementing the project browser part of the eric5 UI. +Module implementing the project browser part of the eric6 UI. """ from __future__ import unicode_literals @@ -28,7 +28,7 @@ class ProjectBrowser(E5TabWidget): """ - Class implementing the project browser part of the eric5 UI. + Class implementing the project browser part of the eric6 UI. It generates a widget with up to seven tabs. The individual tabs contain the project sources browser, the project forms browser,
--- a/Project/ProjectFormsBrowser.py Sat Jul 05 11:41:14 2014 +0200 +++ b/Project/ProjectFormsBrowser.py Sat Jul 05 12:13:23 2014 +0200 @@ -34,7 +34,7 @@ import Preferences import Utilities -from eric5config import getConfig +from eric6config import getConfig class ProjectFormsBrowser(ProjectBaseBrowser):
--- a/Project/TranslationPropertiesDialog.ui Sat Jul 05 11:41:14 2014 +0200 +++ b/Project/TranslationPropertiesDialog.ui Sat Jul 05 12:13:23 2014 +0200 @@ -47,7 +47,7 @@ </property> <property name="whatsThis"> <string><b>Translation Pattern</b> -<p>Enter the path pattern for the translation files using %language% at the place of the language code (e.g. /path_to_eric/i18n/eric5_%language%.ts). This will result in translation files like /path_to_eric/i18n/eric5_de.ts.</p></string> +<p>Enter the path pattern for the translation files using %language% at the place of the language code (e.g. /path_to_eric/i18n/eric6_%language%.ts). This will result in translation files like /path_to_eric/i18n/eric6_de.ts.</p></string> </property> </widget> </item> @@ -55,7 +55,7 @@ <widget class="QLabel" name="textLabel1_3"> <property name="text"> <string>&Translation Path Pattern: -(Use '%language%' where the language code should be inserted, e.g. i18n/eric5_%language%.ts)</string> +(Use '%language%' where the language code should be inserted, e.g. i18n/eric6_%language%.ts)</string> </property> <property name="wordWrap"> <bool>true</bool>
--- a/Project/__init__.py Sat Jul 05 11:41:14 2014 +0200 +++ b/Project/__init__.py Sat Jul 05 12:13:23 2014 +0200 @@ -4,12 +4,12 @@ # """ -Package implementing the project management module of eric5. +Package implementing the project management module of eric6. The project management module consists of the main part, which is -used for reading and writing of eric4 and eric5 project files (*.e4p) -and for performing all operations on the project. It is accompanied by -various UI related modules implementing different dialogs and a tabbed -tree browser for the display of files belonging to the current project -as well as the project model related modules. +used for reading and writing of eric4, eric5 and eric6 project files +(*.e4p) and for performing all operations on the project. It is +accompanied by various UI related modules implementing different dialogs +and a tabbed tree browser for the display of files belonging to the +current project as well as the project model related modules. """
--- a/PyUnit/UnittestDialog.py Sat Jul 05 11:41:14 2014 +0200 +++ b/PyUnit/UnittestDialog.py Sat Jul 05 12:13:23 2014 +0200 @@ -51,7 +51,7 @@ @param prog filename of the program to open @param dbs reference to the debug server object. It is an indication - whether we were called from within the eric5 IDE + whether we were called from within the eric6 IDE @param ui reference to the UI object @param fromEric flag indicating an instantiation from within the eric IDE (boolean) @@ -123,7 +123,7 @@ self.__failedTests = [] - # now connect the debug server signals if called from the eric5 IDE + # now connect the debug server signals if called from the eric6 IDE if self.dbs: self.dbs.utPrepared.connect(self.__UTPrepared) self.dbs.utFinished.connect(self.__setStoppedMode) @@ -280,7 +280,7 @@ self.testName = os.path.splitext(os.path.basename(prog))[0] if self.dbs and not self.localCheckBox.isChecked(): - # we are cooperating with the eric5 IDE + # we are cooperating with the eric6 IDE project = e5App().getObject("Project") if project.isOpen() and project.isProjectSource(prog): mainScript = project.getMainScript(True) @@ -347,7 +347,7 @@ # now set up the coverage stuff if self.coverageCheckBox.isChecked(): if self.dbs: - # we are cooperating with the eric5 IDE + # we are cooperating with the eric6 IDE project = e5App().getObject("Project") if project.isOpen() and project.isProjectSource(prog): mainScript = project.getMainScript(True) @@ -647,7 +647,7 @@ def __showSource(self): """ - Private slot to show the source of a traceback in an eric5 editor. + Private slot to show the source of a traceback in an eric6 editor. """ if not self.dbs: return
--- a/PyUnit/__init__.py Sat Jul 05 11:41:14 2014 +0200 +++ b/PyUnit/__init__.py Sat Jul 05 12:13:23 2014 +0200 @@ -7,7 +7,7 @@ Package implementing an interface to the pyunit unittest package. The package consist of a single dialog, which may be called as a -standalone version using the eric5_unittest script or from within the eric5 -IDE. If it is called from within eric5, it has the additional function to +standalone version using the eric6_unittest script or from within the eric6 +IDE. If it is called from within eric6, it has the additional function to open a source file that failed a test. """
--- a/QScintilla/Editor.py Sat Jul 05 11:41:14 2014 +0200 +++ b/QScintilla/Editor.py Sat Jul 05 12:13:23 2014 +0200 @@ -4,7 +4,7 @@ # """ -Module implementing the editor component of the eric5 IDE. +Module implementing the editor component of the eric6 IDE. """ from __future__ import unicode_literals try: @@ -42,7 +42,7 @@ class Editor(QsciScintillaCompat): """ - Class implementing the editor component of the eric5 IDE. + Class implementing the editor component of the eric6 IDE. @signal modificationStatusChanged(bool, QsciScintillaCompat) emitted when the modification status has changed @@ -6105,7 +6105,7 @@ else: msg = self.tr( """<p>The file <b>{0}</b> has been changed while it""" - """ was opened in eric5. Reread it?</p>""")\ + """ was opened in eric6. Reread it?</p>""")\ .format(self.fileName) yesDefault = True if self.isModified():
--- a/QScintilla/Exporters/ExporterHTML.py Sat Jul 05 11:41:14 2014 +0200 +++ b/QScintilla/Exporters/ExporterHTML.py Sat Jul 05 12:13:23 2014 +0200 @@ -84,7 +84,7 @@ else: html += '''<title>{0}</title>\n'''.format( os.path.basename(self.editor.getFileName())) - html += '''<meta name="Generator" content="eric5" />\n''' \ + html += '''<meta name="Generator" content="eric6" />\n''' \ '''<meta http-equiv="Content-Type" ''' \ '''content="text/html; charset=utf-8" />\n''' if folding:
--- a/QScintilla/Exporters/ExporterRTF.py Sat Jul 05 11:41:14 2014 +0200 +++ b/QScintilla/Exporters/ExporterRTF.py Sat Jul 05 12:13:23 2014 +0200 @@ -40,7 +40,7 @@ RTF_COLORDEFCLOSE = "}" RTF_INFOOPEN = "{\\info " RTF_INFOCLOSE = "}" - RTF_COMMENT = "{\\comment Generated by eric5's RTF export filter.}" + RTF_COMMENT = "{\\comment Generated by eric6's RTF export filter.}" # to be used by strftime RTF_CREATED = "{\creatim\yr%Y\mo%m\dy%d\hr%H\min%M\sec%S}" RTF_BODYOPEN = ""
--- a/QScintilla/MiniEditor.py Sat Jul 05 11:41:14 2014 +0200 +++ b/QScintilla/MiniEditor.py Sat Jul 05 12:13:23 2014 +0200 @@ -251,9 +251,9 @@ """ E5MessageBox.about( self, - self.tr("About eric5 Mini Editor"), + self.tr("About eric6 Mini Editor"), self.tr( - "The eric5 Mini Editor is an editor component" + "The eric6 Mini Editor is an editor component" " based on QScintilla. It may be used for simple" " editing tasks, that don't need the power of" " a full blown editor.")) @@ -262,7 +262,7 @@ """ Private slot to handle the About Qt dialog. """ - E5MessageBox.aboutQt(self, "eric5 Mini Editor") + E5MessageBox.aboutQt(self, "eric6 Mini Editor") def __whatsThis(self): """ @@ -351,7 +351,7 @@ self.__createSearchActions() # read the keyboard shortcuts and make them identical to the main - # eric5 shortcuts + # eric6 shortcuts for act in self.helpActions: self.__readShortcut(act, "General") for act in self.editActions: @@ -2176,7 +2176,7 @@ if self.__textEdit.isModified(): ret = E5MessageBox.okToClearData( self, - self.tr("eric5 Mini Editor"), + self.tr("eric6 Mini Editor"), self.tr("The document has unsaved changes."), self.__save) return ret
--- a/QScintilla/__init__.py Sat Jul 05 11:41:14 2014 +0200 +++ b/QScintilla/__init__.py Sat Jul 05 12:13:23 2014 +0200 @@ -4,9 +4,9 @@ # """ -Package implementing the editor and shell components of the eric5 IDE. +Package implementing the editor and shell components of the eric6 IDE. -The editor component of the eric5 IDE is based on the Qt port +The editor component of the eric6 IDE is based on the Qt port of the Scintilla editor widget. It supports syntax highlighting, code folding, has an interface to the integrated debugger and can be configured to the most possible degree.
--- a/Snapshot/SnapWidget.py Sat Jul 05 11:41:14 2014 +0200 +++ b/Snapshot/SnapWidget.py Sat Jul 05 12:13:23 2014 +0200 @@ -493,7 +493,7 @@ if self.__modified: res = E5MessageBox.question( self, - self.tr("eric5 Snapshot"), + self.tr("eric6 Snapshot"), self.tr( """The application contains an unsaved snapshot."""), E5MessageBox.StandardButtons( @@ -521,6 +521,6 @@ """ self.setWindowTitle("{0}[*] - {1}".format( os.path.basename(self.__filename), - self.tr("eric5 Snapshot"))) + self.tr("eric6 Snapshot"))) self.setWindowModified(self.__modified) self.pathNameEdit.setText(os.path.dirname(self.__filename))
--- a/Snapshot/SnapWidget.ui Sat Jul 05 11:41:14 2014 +0200 +++ b/Snapshot/SnapWidget.ui Sat Jul 05 12:13:23 2014 +0200 @@ -17,7 +17,7 @@ </size> </property> <property name="windowTitle"> - <string>eric5 Snapshot</string> + <string>eric6 Snapshot</string> </property> <layout class="QVBoxLayout" name="verticalLayout"> <item>
--- a/SqlBrowser/SqlBrowserWidget.ui Sat Jul 05 11:41:14 2014 +0200 +++ b/SqlBrowser/SqlBrowserWidget.ui Sat Jul 05 12:13:23 2014 +0200 @@ -11,7 +11,7 @@ </rect> </property> <property name="windowTitle"> - <string>eric5 SQL Browser</string> + <string>eric6 SQL Browser</string> </property> <layout class="QVBoxLayout" name="verticalLayout_2"> <item>
--- a/Templates/TemplateViewer.py Sat Jul 05 11:41:14 2014 +0200 +++ b/Templates/TemplateViewer.py Sat Jul 05 12:13:23 2014 +0200 @@ -939,7 +939,7 @@ """ if filename is None: filename = os.path.join( - Utilities.getConfigDir(), "eric5templates.e4c") + Utilities.getConfigDir(), "eric6templates.e4c") f = QFile(filename) ok = f.open(QIODevice.WriteOnly) if not ok: @@ -966,7 +966,7 @@ """ if filename is None: filename = os.path.join( - Utilities.getConfigDir(), "eric5templates.e4c") + Utilities.getConfigDir(), "eric6templates.e4c") if not os.path.exists(filename): return
--- a/ThirdParty/CharDet/__init__.py Sat Jul 05 11:41:14 2014 +0200 +++ b/ThirdParty/CharDet/__init__.py Sat Jul 05 12:13:23 2014 +0200 @@ -4,5 +4,5 @@ # """ -Package containing the universal character encoding detector used by eric5. +Package containing the universal character encoding detector used by eric6. """ \ No newline at end of file
--- a/ThirdParty/Jasy/jasy/core/__init__.py Sat Jul 05 11:41:14 2014 +0200 +++ b/ThirdParty/Jasy/jasy/core/__init__.py Sat Jul 05 12:13:23 2014 +0200 @@ -4,6 +4,6 @@ # # -# This is an eric5 dummy package to provide some specially variants of modules +# This is an eric6 dummy package to provide some specially variants of modules # found in the standard jasy package #
--- a/ThirdParty/Jasy/jasy/js/util/__init__.py Sat Jul 05 11:41:14 2014 +0200 +++ b/ThirdParty/Jasy/jasy/js/util/__init__.py Sat Jul 05 12:13:23 2014 +0200 @@ -4,7 +4,7 @@ # # -# minimized for using just the parser within eric5 +# minimized for using just the parser within eric6 # Copyright (c) 2013 - 2014 Detlev Offenbach <detlev@die-offenbachs.de> #
--- a/ThirdParty/__init__.py Sat Jul 05 11:41:14 2014 +0200 +++ b/ThirdParty/__init__.py Sat Jul 05 12:13:23 2014 +0200 @@ -4,5 +4,5 @@ # """ -Package containing third party packages used by eric5. +Package containing third party packages used by eric6. """ \ No newline at end of file
--- a/Toolbox/Startup.py Sat Jul 05 11:41:14 2014 +0200 +++ b/Toolbox/Startup.py Sat Jul 05 12:13:23 2014 +0200 @@ -22,7 +22,7 @@ import UI.PixmapCache -from eric5config import getConfig +from eric6config import getConfig def usage(appinfo, optlen=12): @@ -168,7 +168,7 @@ # set the default encoding for tr() QTextCodec.setCodecForTr(QTextCodec.codecForName("utf-8")) - translations = ("qt", "eric5") + translationFiles + translations = ("qt", "eric6") + translationFiles loc = Preferences.getUILanguage() if loc is None: return @@ -187,7 +187,7 @@ if ok: app.installTranslator(translator) else: - if tf.startswith("eric5"): + if tf.startswith("eric6"): loca = None loc = loca else: @@ -201,7 +201,7 @@ Module function to start up an application that doesn't need a specialized start up. - This function is used by all of eric5's helper programs. + This function is used by all of eric6's helper programs. @param argv list of commandline parameters (list of strings) @param appinfo dictionary describing the application
--- a/Tools/TRSingleApplication.py Sat Jul 05 11:41:14 2014 +0200 +++ b/Tools/TRSingleApplication.py Sat Jul 05 12:13:23 2014 +0200 @@ -20,7 +20,7 @@ # define some module global stuff ########################################################################### -SAFile = "eric5_trpreviewer" +SAFile = "eric6_trpreviewer" # define the protocol tokens SALoadForm = '>LoadForm<'
--- a/Tools/TrayStarter.py Sat Jul 05 11:41:14 2014 +0200 +++ b/Tools/TrayStarter.py Sat Jul 05 12:13:23 2014 +0200 @@ -24,7 +24,7 @@ import Utilities import Preferences -from eric5config import getConfig +from eric6config import getConfig class TrayStarter(QSystemTrayIcon): @@ -56,7 +56,7 @@ self.activated.connect(self.__activated) - self.__menu = QMenu(self.tr("Eric5 tray starter")) + self.__menu = QMenu(self.tr("Eric6 tray starter")) self.recentProjectsMenu = QMenu( self.tr('Recent Projects'), self.__menu) @@ -75,7 +75,7 @@ self.recentFilesMenu.triggered.connect(self.__openRecent) act = self.__menu.addAction( - self.tr("Eric5 tray starter"), self.__about) + self.tr("Eric6 tray starter"), self.__about) font = act.font() font.setBold(True) act.setFont(font) @@ -98,7 +98,7 @@ self.tr("Unittest"), self.__startUnittest) self.__menu.addAction( UI.PixmapCache.getIcon("ericWeb.png"), - self.tr("eric5 Web Browser"), self.__startHelpViewer) + self.tr("eric6 Web Browser"), self.__startHelpViewer) self.__menu.addSeparator() self.__menu.addAction( @@ -138,10 +138,10 @@ self.tr('Preferences'), self.__startPreferences) self.__menu.addAction( UI.PixmapCache.getIcon("erict.png"), - self.tr("eric5 IDE"), self.__startEric) + self.tr("eric6 IDE"), self.__startEric) self.__menu.addAction( UI.PixmapCache.getIcon("editor.png"), - self.tr("eric5 Mini Editor"), self.__startMiniEditor) + self.tr("eric6 Mini Editor"), self.__startMiniEditor) self.__menu.addSeparator() self.__menu.addAction( @@ -224,9 +224,9 @@ def __startProc(self, applName, *applArgs): """ - Private method to start an eric5 application. + Private method to start an eric6 application. - @param applName name of the eric5 application script (string) + @param applName name of the eric6 application script (string) @param *applArgs variable list of application arguments """ proc = QProcess() @@ -250,121 +250,121 @@ def __startMiniEditor(self): """ - Private slot to start the eric5 Mini Editor. + Private slot to start the eric6 Mini Editor. """ - self.__startProc("eric5_editor.py", "--config={0}".format( + self.__startProc("eric6_editor.py", "--config={0}".format( Utilities.getConfigDir())) def __startEric(self): """ - Private slot to start the eric5 IDE. + Private slot to start the eric6 IDE. """ - self.__startProc("eric5.py", "--config={0}".format( + self.__startProc("eric6.py", "--config={0}".format( Utilities.getConfigDir())) def __startPreferences(self): """ - Private slot to start the eric5 configuration dialog. + Private slot to start the eric6 configuration dialog. """ - self.__startProc("eric5_configure.py", "--config={0}".format( + self.__startProc("eric6_configure.py", "--config={0}".format( Utilities.getConfigDir())) def __startPluginInstall(self): """ - Private slot to start the eric5 plugin installation dialog. + Private slot to start the eric6 plugin installation dialog. """ - self.__startProc("eric5_plugininstall.py", "--config={0}".format( + self.__startProc("eric6_plugininstall.py", "--config={0}".format( Utilities.getConfigDir())) def __startPluginUninstall(self): """ - Private slot to start the eric5 plugin uninstallation dialog. + Private slot to start the eric6 plugin uninstallation dialog. """ - self.__startProc("eric5_pluginuninstall.py", "--config={0}".format( + self.__startProc("eric6_pluginuninstall.py", "--config={0}".format( Utilities.getConfigDir())) def __startPluginRepository(self): """ - Private slot to start the eric5 plugin repository dialog. + Private slot to start the eric6 plugin repository dialog. """ - self.__startProc("eric5_pluginrepository.py", "--config={0}".format( + self.__startProc("eric6_pluginrepository.py", "--config={0}".format( Utilities.getConfigDir())) def __startHelpViewer(self): """ - Private slot to start the eric5 web browser. + Private slot to start the eric6 web browser. """ - self.__startProc("eric5_webbrowser.py", "--config={0}".format( + self.__startProc("eric6_webbrowser.py", "--config={0}".format( Utilities.getConfigDir())) def __startUIPreviewer(self): """ - Private slot to start the eric5 UI previewer. + Private slot to start the eric6 UI previewer. """ - self.__startProc("eric5_uipreviewer.py", "--config={0}".format( + self.__startProc("eric6_uipreviewer.py", "--config={0}".format( Utilities.getConfigDir())) def __startTRPreviewer(self): """ - Private slot to start the eric5 translations previewer. + Private slot to start the eric6 translations previewer. """ - self.__startProc("eric5_trpreviewer.py", "--config={0}".format( + self.__startProc("eric6_trpreviewer.py", "--config={0}".format( Utilities.getConfigDir())) def __startUnittest(self): """ - Private slot to start the eric5 unittest dialog. + Private slot to start the eric6 unittest dialog. """ - self.__startProc("eric5_unittest.py", "--config={0}".format( + self.__startProc("eric6_unittest.py", "--config={0}".format( Utilities.getConfigDir())) def __startDiff(self): """ - Private slot to start the eric5 diff dialog. + Private slot to start the eric6 diff dialog. """ - self.__startProc("eric5_diff.py", "--config={0}".format( + self.__startProc("eric6_diff.py", "--config={0}".format( Utilities.getConfigDir())) def __startCompare(self): """ - Private slot to start the eric5 compare dialog. + Private slot to start the eric6 compare dialog. """ - self.__startProc("eric5_compare.py", "--config={0}".format( + self.__startProc("eric6_compare.py", "--config={0}".format( Utilities.getConfigDir())) def __startSqlBrowser(self): """ - Private slot to start the eric5 sql browser dialog. + Private slot to start the eric6 sql browser dialog. """ - self.__startProc("eric5_sqlbrowser.py", "--config={0}".format( + self.__startProc("eric6_sqlbrowser.py", "--config={0}".format( Utilities.getConfigDir())) def __startIconEditor(self): """ - Private slot to start the eric5 icon editor dialog. + Private slot to start the eric6 icon editor dialog. """ - self.__startProc("eric5_iconeditor.py", "--config={0}".format( + self.__startProc("eric6_iconeditor.py", "--config={0}".format( Utilities.getConfigDir())) def __startSnapshot(self): """ - Private slot to start the eric5 snapshot dialog. + Private slot to start the eric6 snapshot dialog. """ - self.__startProc("eric5_snap.py", "--config={0}".format( + self.__startProc("eric6_snap.py", "--config={0}".format( Utilities.getConfigDir())) def __startQRegExp(self): """ - Private slot to start the eric5 QRegExp editor dialog. + Private slot to start the eric6 QRegExp editor dialog. """ - self.__startProc("eric5_qregexp.py", "--config={0}".format( + self.__startProc("eric6_qregexp.py", "--config={0}".format( Utilities.getConfigDir())) def __startPyRe(self): """ - Private slot to start the eric5 Python re editor dialog. + Private slot to start the eric6 Python re editor dialog. """ - self.__startProc("eric5_re.py", "--config={0}".format( + self.__startProc("eric6_re.py", "--config={0}".format( Utilities.getConfigDir())) def __showRecentProjectsMenu(self): @@ -442,7 +442,7 @@ """ filename = act.data() if filename: - self.__startProc("eric5.py", filename) + self.__startProc("eric6.py", filename) def __showPreferences(self): """
--- a/UI/EmailDialog.py Sat Jul 05 11:41:14 2014 +0200 +++ b/UI/EmailDialog.py Sat Jul 05 12:13:23 2014 +0200 @@ -211,7 +211,7 @@ msg = self.__encodedText(msgtext) msg['From'] = Preferences.getUser("Email") msg['To'] = self.__toAddress - subject = '[eric5] {0}'.format(self.subject.text()) + subject = '[eric6] {0}'.format(self.subject.text()) msg['Subject'] = self.__encodedHeader(subject) return msg.as_string() @@ -236,7 +236,7 @@ msg = MIMEMultipart() msg['From'] = Preferences.getUser("Email") msg['To'] = self.__toAddress - subject = '[eric5] {0}'.format(self.subject.text()) + subject = '[eric6] {0}'.format(self.subject.text()) msg['Subject'] = self.__encodedHeader(subject) msg.preamble = mpPreamble msg.epilogue = ''
--- a/UI/Info.py Sat Jul 05 11:41:14 2014 +0200 +++ b/UI/Info.py Sat Jul 05 12:13:23 2014 +0200 @@ -9,10 +9,10 @@ from __future__ import unicode_literals -Program = 'eric5' +Program = 'eric6' Version = '@@VERSION@@ (rev @@REVISION@@)' Copyright = 'Copyright (c) 2002 - 2014 Detlev Offenbach' \ ' <detlev@die-offenbachs.de>' -BugAddress = 'eric5-bugs@eric-ide.python-projects.org' -FeatureAddress = 'eric5-featurerequest@eric-ide.python-projects.org' +BugAddress = 'eric-bugs@eric-ide.python-projects.org' +FeatureAddress = 'eric-featurerequest@eric-ide.python-projects.org' Homepage = "http://eric-ide.python-projects.org/index.html"
--- a/UI/SplashScreen.py Sat Jul 05 11:41:14 2014 +0200 +++ b/UI/SplashScreen.py Sat Jul 05 12:13:23 2014 +0200 @@ -4,7 +4,7 @@ # """ -Module implementing a splashscreen for eric5. +Module implementing a splashscreen for eric6. """ from __future__ import unicode_literals @@ -16,12 +16,12 @@ from PyQt5.QtGui import QPixmap, QColor from PyQt5.QtWidgets import QApplication, QSplashScreen -from eric5config import getConfig +from eric6config import getConfig class SplashScreen(QSplashScreen): """ - Class implementing a splashscreen for eric5. + Class implementing a splashscreen for eric6. """ def __init__(self): """ @@ -56,7 +56,7 @@ class NoneSplashScreen(object): """ - Class implementing a "None" splashscreen for eric5. + Class implementing a "None" splashscreen for eric6. This class implements the same interface as the real splashscreen, but simply does nothing.
--- a/UI/UserInterface.py Sat Jul 05 11:41:14 2014 +0200 +++ b/UI/UserInterface.py Sat Jul 05 12:13:23 2014 +0200 @@ -54,7 +54,7 @@ except ImportError: SSL_AVAILABLE = False -from eric5config import getConfig +from eric6config import getConfig class Redirector(QObject): @@ -143,7 +143,7 @@ BottomSide = 2 RightSide = 3 - ErrorLogFileName = "eric5_error.log" + ErrorLogFileName = "eric6_error.log" def __init__(self, app, locale, splash, plugin, noOpenAtStartup, restartArguments): @@ -1222,10 +1222,10 @@ QKeySequence(self.tr("Ctrl+Shift+N", "File|New Window")), 0, self, 'new_window') self.newWindowAct.setStatusTip(self.tr( - 'Open a new eric5 instance')) + 'Open a new eric6 instance')) self.newWindowAct.setWhatsThis(self.tr( """<b>New Window</b>""" - """<p>This opens a new instance of the eric5 IDE.</p>""" + """<p>This opens a new instance of the eric6 IDE.</p>""" )) self.newWindowAct.triggered.connect(self.__newWindow) self.actions.append(self.newWindowAct) @@ -1587,7 +1587,7 @@ 'Open the helpviewer window')) self.helpviewerAct.setWhatsThis(self.tr( """<b>Helpviewer</b>""" - """<p>Display the eric5 web browser. This window will show""" + """<p>Display the eric6 web browser. This window will show""" """ HTML help files and help from Qt help collections. It has""" """ the capability to navigate to links, set bookmarks, print""" """ the displayed help and some more features. You may use it to""" @@ -1621,7 +1621,7 @@ self.checkUpdateAct.setStatusTip(self.tr('Check for Updates')) self.checkUpdateAct.setWhatsThis(self.tr( """<b>Check for Updates...</b>""" - """<p>Checks the internet for updates of eric5.</p>""" + """<p>Checks the internet for updates of eric6.</p>""" )) self.checkUpdateAct.triggered.connect(self.performVersionCheck) self.actions.append(self.checkUpdateAct) @@ -1634,7 +1634,7 @@ self.tr('Show the versions available for download')) self.showVersionsAct.setWhatsThis(self.tr( """<b>Show downloadable versions...</b>""" - """<p>Shows the eric5 versions available for download """ + """<p>Shows the eric6 versions available for download """ """from the internet.</p>""" )) self.showVersionsAct.triggered.connect( @@ -1888,15 +1888,15 @@ self.actions.append(self.miniEditorAct) self.webBrowserAct = E5Action( - self.tr('eric5 Web Browser'), + self.tr('eric6 Web Browser'), UI.PixmapCache.getIcon("ericWeb.png"), - self.tr('eric5 &Web Browser...'), + self.tr('eric6 &Web Browser...'), 0, 0, self, 'web_browser') self.webBrowserAct.setStatusTip(self.tr( - 'Start the eric5 Web Browser')) + 'Start the eric6 Web Browser')) self.webBrowserAct.setWhatsThis(self.tr( - """<b>eric5 Web Browser</b>""" - """<p>Browse the Internet with the eric5 Web Browser.</p>""" + """<b>eric6 Web Browser</b>""" + """<p>Browse the Internet with the eric6 Web Browser.</p>""" )) self.webBrowserAct.triggered.connect(self.__startWebBrowser) self.actions.append(self.webBrowserAct) @@ -1907,10 +1907,10 @@ self.tr('&Icon Editor...'), 0, 0, self, 'icon_editor') self.iconEditorAct.setStatusTip(self.tr( - 'Start the eric5 Icon Editor')) + 'Start the eric6 Icon Editor')) self.iconEditorAct.setWhatsThis(self.tr( """<b>Icon Editor</b>""" - """<p>Starts the eric5 Icon Editor for editing simple icons.</p>""" + """<p>Starts the eric6 Icon Editor for editing simple icons.</p>""" )) self.iconEditorAct.triggered.connect(self.__editPixmap) self.actions.append(self.iconEditorAct) @@ -1997,7 +1997,7 @@ self.showExternalToolsAct.setWhatsThis(self.tr( """<b>Show external tools</b>""" """<p>Opens a dialog to show the path and versions of all""" - """ extenal tools used by eric5.</p>""" + """ extenal tools used by eric6.</p>""" )) self.showExternalToolsAct.triggered.connect( self.__showExternalTools) @@ -2331,7 +2331,7 @@ def __initEricDocAction(self): """ - Private slot to initialize the action to show the eric5 documentation. + Private slot to initialize the action to show the eric6 documentation. """ self.ericDocAct = E5Action( self.tr("Eric API Documentation"), @@ -2343,7 +2343,7 @@ """<b>Eric API Documentation</b>""" """<p>Display the Eric API documentation. The location for the""" """ documentation is the Documentation/Source subdirectory of""" - """ the eric5 installation directory.</p>""" + """ the eric6 installation directory.</p>""" )) self.ericDocAct.triggered.connect(self.__showEricDoc) self.actions.append(self.ericDocAct) @@ -3019,7 +3019,7 @@ address = FeatureAddress else: address = BugAddress - subject = "[eric5] " + subject = "[eric6] " if attachFile is not None: f = open(attachFile, "r", encoding="utf-8") body = f.read() @@ -3271,21 +3271,21 @@ if res and self.__shutdown(): e5App().closeAllWindows() program = sys.executable - eric5 = os.path.join(getConfig("ericDir"), "eric5.py") - args = [eric5] + eric6 = os.path.join(getConfig("ericDir"), "eric6.py") + args = [eric6] args.append("--start-session") args.extend(self.__restartArgs) QProcess.startDetached(program, args) def __newWindow(self): """ - Private slot to start a new instance of eric5. + Private slot to start a new instance of eric6. """ if not Preferences.getUI("SingleApplicationMode"): - # start eric5 without any arguments + # start eric6 without any arguments program = sys.executable - eric5 = os.path.join(getConfig("ericDir"), "eric5.py") - args = [eric5] + eric6 = os.path.join(getConfig("ericDir"), "eric6.py") + args = [eric6] QProcess.startDetached(program, args) def __showToolsMenu(self): @@ -4099,7 +4099,7 @@ E5MessageBox.information( self, self.tr("Qt 3 support"), - self.tr("""Qt v.3 is not supported by eric5.""")) + self.tr("""Qt v.3 is not supported by eric6.""")) return args = [] @@ -4164,7 +4164,7 @@ E5MessageBox.information( self, self.tr("Qt 3 support"), - self.tr("""Qt v.3 is not supported by eric5.""")) + self.tr("""Qt v.3 is not supported by eric6.""")) return args = [] @@ -4235,7 +4235,7 @@ E5MessageBox.information( self, self.tr("Qt 3 support"), - self.tr("""Qt v.3 is not supported by eric5.""")) + self.tr("""Qt v.3 is not supported by eric6.""")) return args = [] @@ -4273,7 +4273,7 @@ def __startWebBrowser(self): """ - Private slot to start the eric5 web browser. + Private slot to start the eric6 web browser. """ self.launchHelpViewer("") @@ -4337,7 +4337,7 @@ """ proc = QProcess() - viewer = os.path.join(getConfig("ericDir"), "eric5_uipreviewer.py") + viewer = os.path.join(getConfig("ericDir"), "eric6_uipreviewer.py") args = [] args.append(viewer) @@ -4389,7 +4389,7 @@ """ proc = QProcess() - viewer = os.path.join(getConfig("ericDir"), "eric5_trpreviewer.py") + viewer = os.path.join(getConfig("ericDir"), "eric6_trpreviewer.py") args = [] args.append(viewer) @@ -4436,7 +4436,7 @@ """ proc = QProcess() - browser = os.path.join(getConfig("ericDir"), "eric5_sqlbrowser.py") + browser = os.path.join(getConfig("ericDir"), "eric6_sqlbrowser.py") args = [] args.append(browser) @@ -4494,7 +4494,7 @@ """ proc = QProcess() - snap = os.path.join(getConfig("ericDir"), "eric5_snap.py") + snap = os.path.join(getConfig("ericDir"), "eric6_snap.py") args = [] args.append(snap) @@ -5113,7 +5113,7 @@ def __webBrowser(self, home=""): """ - Private slot to start the eric5 web browser. + Private slot to start the eric6 web browser. @param home full pathname of a file to display (string) """ @@ -5247,7 +5247,7 @@ def __showExternalTools(self): """ Private slot to display a dialog show a list of external tools used - by eric5. + by eric6. """ if self.programsDialog is None: from Preferences.ProgramsDialog import ProgramsDialog @@ -5449,7 +5449,7 @@ """ Private slot to write the tasks data to an XML file (.e4t). """ - fn = os.path.join(Utilities.getConfigDir(), "eric5tasks.e4t") + fn = os.path.join(Utilities.getConfigDir(), "eric6tasks.e4t") f = QFile(fn) ok = f.open(QIODevice.WriteOnly) if not ok: @@ -5469,7 +5469,7 @@ """ Private slot to read in the tasks file (.e4t). """ - fn = os.path.join(Utilities.getConfigDir(), "eric5tasks.e4t") + fn = os.path.join(Utilities.getConfigDir(), "eric6tasks.e4t") if not os.path.exists(fn): return f = QFile(fn) @@ -5490,7 +5490,7 @@ """ Private slot to write the session data to an XML file (.e5s). """ - fn = os.path.join(Utilities.getConfigDir(), "eric5session.e5s") + fn = os.path.join(Utilities.getConfigDir(), "eric6session.e5s") f = QFile(fn) if f.open(QIODevice.WriteOnly): from E5XML.SessionWriter import SessionWriter @@ -5508,9 +5508,9 @@ """ Private slot to read in the session file (.e5s or .e4s). """ - fn = os.path.join(Utilities.getConfigDir(), "eric5session.e5s") + fn = os.path.join(Utilities.getConfigDir(), "eric6session.e5s") if not os.path.exists(fn): - fn = os.path.join(Utilities.getConfigDir(), "eric5session.e4s") + fn = os.path.join(Utilities.getConfigDir(), "eric6session.e4s") if not os.path.exists(fn): E5MessageBox.critical( self, @@ -5818,7 +5818,7 @@ def showAvailableVersionsInfo(self): """ - Public method to show the eric5 versions available for download. + Public method to show the eric6 versions available for download. """ self.performVersionCheck(manual=True, showVersions=True) @@ -5826,7 +5826,7 @@ def performVersionCheck(self, manual=True, alternative=0, showVersions=False): """ - Public method to check the internet for an eric5 update. + Public method to check the internet for an eric6 update. @param manual flag indicating an invocation via the menu (boolean) @param alternative index of server to download from (integer) @@ -5982,7 +5982,7 @@ self, self.tr("Update available"), self.tr( - """The update to <b>{0}</b> of eric5 is""" + """The update to <b>{0}</b> of eric6 is""" """ available at <b>{1}</b>. Would you like to""" """ get it?""") .format(versions[2], versions[3]), @@ -5993,7 +5993,7 @@ self, self.tr("Update available"), self.tr( - """The update to <b>{0}</b> of eric5 is""" + """The update to <b>{0}</b> of eric6 is""" """ available at <b>{1}</b>. Would you like to""" """ get it?""") .format(versions[0], versions[1]), @@ -6003,10 +6003,10 @@ if self.manualUpdatesCheck: E5MessageBox.information( self, - self.tr("Eric5 is up to date"), + self.tr("Eric6 is up to date"), self.tr( """You are using the latest version of""" - """ eric5""")) + """ eric6""")) else: # check release version if versions[0] > Version: @@ -6014,7 +6014,7 @@ self, self.tr("Update available"), self.tr( - """The update to <b>{0}</b> of eric5 is""" + """The update to <b>{0}</b> of eric6 is""" """ available at <b>{1}</b>. Would you like""" """ to get it?""") .format(versions[0], versions[1]), @@ -6024,10 +6024,10 @@ if self.manualUpdatesCheck: E5MessageBox.information( self, - self.tr("Eric5 is up to date"), + self.tr("Eric6 is up to date"), self.tr( """You are using the latest version of""" - """ eric5""")) + """ eric6""")) except IndexError: E5MessageBox.warning( self, @@ -6087,7 +6087,7 @@ def checkConfigurationStatus(self): """ - Public method to check, if eric5 has been configured. If it is not, + Public method to check, if eric6 has been configured. If it is not, the configuration dialog is shown. """ if not Preferences.isConfigured(): @@ -6096,7 +6096,7 @@ E5MessageBox.information( self, self.tr("First time usage"), - self.tr("""eric5 has not been configured yet. """ + self.tr("""eric6 has not been configured yet. """ """The configuration dialog will be started.""")) self.showPreferences() @@ -6121,7 +6121,7 @@ def versionIsNewer(self, required, snapshot=None): """ - Public method to check, if the eric5 version is good compared to + Public method to check, if the eric6 version is good compared to the required version. @param required required version (string)
--- a/Utilities/BackgroundService.py Sat Jul 05 11:41:14 2014 +0200 +++ b/Utilities/BackgroundService.py Sat Jul 05 12:13:23 2014 +0200 @@ -26,7 +26,7 @@ import Preferences import Utilities -from eric5config import getConfig +from eric6config import getConfig class BackgroundService(QTcpServer):
--- a/Utilities/__init__.py Sat Jul 05 11:41:14 2014 +0200 +++ b/Utilities/__init__.py Sat Jul 05 12:13:23 2014 +0200 @@ -4,7 +4,7 @@ # """ -Package implementing various functions/classes needed everywhere within eric5. +Package implementing various functions/classes needed everywhere within eric6. """ from __future__ import unicode_literals @@ -74,7 +74,7 @@ from Plugins.CheckerPlugins.SyntaxChecker.SyntaxCheck import ( # __IGNORE_WARNING__ normalizeCode) -from eric5config import getConfig +from eric6config import getConfig configDir = None @@ -1020,7 +1020,7 @@ '.svn', '_svn', '.hg', '_hg', '.ropeproject', '_ropeproject', - '.eric5project', '_eric5project', + '.eric6project', '_eric6project', '.issues', '_issues']: continue
--- a/Utilities/compatibility_fixes.py Sat Jul 05 11:41:14 2014 +0200 +++ b/Utilities/compatibility_fixes.py Sat Jul 05 12:13:23 2014 +0200 @@ -4,9 +4,9 @@ # """ -Module implementing the open behavior of Python3 for use with Eric5. +Module implementing the open behavior of Python3 for use with Eric6. -The Eric5 used features are emulated only. The not emulated features +The Eric6 used features are emulated only. The not emulated features should throw a NotImplementedError exception. """
--- a/ViewManager/ViewManager.py Sat Jul 05 11:41:14 2014 +0200 +++ b/ViewManager/ViewManager.py Sat Jul 05 12:13:23 2014 +0200 @@ -6658,7 +6658,7 @@ """ Public method to get a reference to the APIs manager. - @return the APIs manager object (eric5.QScintilla.APIsManager) + @return the APIs manager object (eric6.QScintilla.APIsManager) """ return self.apisManager
--- a/ViewManager/__init__.py Sat Jul 05 11:41:14 2014 +0200 +++ b/ViewManager/__init__.py Sat Jul 05 12:13:23 2014 +0200 @@ -4,7 +4,7 @@ # """ -Package implementing the viewmanager of the eric5 IDE. +Package implementing the viewmanager of the eric6 IDE. The viewmanager is responsible for the layout of the editor windows. This is the central part of the IDE. In additon to this, the viewmanager provides all
--- a/__init__.py Sat Jul 05 11:41:14 2014 +0200 +++ b/__init__.py Sat Jul 05 12:13:23 2014 +0200 @@ -6,6 +6,6 @@ """ Package implementing the eric6 Python IDE (version 6.0). -To get more information about eric5 please see the +To get more information about eric6 please see the <a href="http://eric-ide.python-projects.org/index.html">eric web site</a>. """
--- a/cleanupSource.py Sat Jul 05 11:41:14 2014 +0200 +++ b/cleanupSource.py Sat Jul 05 12:13:23 2014 +0200 @@ -5,7 +5,7 @@ # """ -Script for eric5 to clean up the source tree. +Script for eric6 to clean up the source tree. """ from __future__ import unicode_literals @@ -70,5 +70,5 @@ print( "\nAn internal error occured. Please report all the output of the" " program, \nincluding the following traceback, to" - " eric5-bugs@eric-ide.python-projects.org.\n") + " eric-bugs@eric-ide.python-projects.org.\n") raise
--- a/compileUiFiles.py Sat Jul 05 11:41:14 2014 +0200 +++ b/compileUiFiles.py Sat Jul 05 12:13:23 2014 +0200 @@ -5,7 +5,7 @@ # """ -Script for eric5 to compile all .ui files to Python source. +Script for eric6 to compile all .ui files to Python source. """ from __future__ import unicode_literals @@ -125,5 +125,5 @@ print( "\nAn internal error occured. Please report all the output of the" " program, \nincluding the following traceback, to" - " eric5-bugs@eric-ide.python-projects.org.\n") + " eric-bugs@eric-ide.python-projects.org.\n") raise
--- a/eric6.e4p Sat Jul 05 11:41:14 2014 +0200 +++ b/eric6.e4p Sat Jul 05 12:13:23 2014 +0200 @@ -656,8 +656,6 @@ <Source>Helpviewer/AdBlock/AdBlockPage.py</Source> <Source>compileUiFiles.py</Source> <Source>Helpviewer/OpenSearch/OpenSearchEditDialog.py</Source> - <Source>DebugClients/Python/eric5dbgstub.py</Source> - <Source>DebugClients/Python3/eric5dbgstub.py</Source> <Source>DebugClients/Python3/coverage/bytecode.py</Source> <Source>DebugClients/Python3/coverage/xmlreport.py</Source> <Source>DebugClients/Python3/coverage/phystokens.py</Source> @@ -1149,6 +1147,8 @@ <Source>eric6_webbrowser.py</Source> <Source>eric6_webbrowser.pyw</Source> <Source>eric6config.py</Source> + <Source>DebugClients/Python/eric6dbgstub.py</Source> + <Source>DebugClients/Python3/eric6dbgstub.py</Source> </Sources> <Forms> <Form>PyUnit/UnittestDialog.ui</Form>
--- a/eric6.py Sat Jul 05 11:41:14 2014 +0200 +++ b/eric6.py Sat Jul 05 12:13:23 2014 +0200 @@ -5,7 +5,7 @@ # """ -Eric5 Python IDE. +Eric6 Python IDE. This is the main Python script that performs the necessary initialization of the IDE and starts the Qt event loop. @@ -91,7 +91,7 @@ client.processArgs(sys.argv[1:]) sys.exit(0) elif res < 0: - print("eric5: {0}".format(client.errstr())) + print("eric6: {0}".format(client.errstr())) sys.exit(res) @@ -109,7 +109,7 @@ import Globals separator = '-' * 80 - logFile = os.path.join(Globals.getConfigDir(), "eric5_error.log") + logFile = os.path.join(Globals.getConfigDir(), "eric6_error.log") notice = \ """An unhandled exception occurred. Please report the problem\n"""\ """using the error reporting dialog or via email to <{0}>.\n"""\ @@ -204,7 +204,7 @@ "(everything after that is considered arguments for this program)") ] appinfo = AppInfo.makeAppInfo(sys.argv, - "Eric5", + "Eric6", "[project | files... [--] [debug-options]]", "A Python IDE", options) @@ -278,13 +278,13 @@ # Load translation files and install them loc = Startup.loadTranslators(qt4TransDir, app, ("qscintilla",)) - splash.showMessage(QCoreApplication.translate("eric5", "Starting...")) + splash.showMessage(QCoreApplication.translate("eric6", "Starting...")) # We can only import these after creating the E5Application because they # make Qt calls that need the E5Application to exist. from UI.UserInterface import UserInterface splash.showMessage( - QCoreApplication.translate("eric5", "Generating Main Window...")) + QCoreApplication.translate("eric6", "Generating Main Window...")) try: mainWindow = UserInterface(app, loc, splash, pluginFile, noopen, restartArgs)
--- a/eric6.pyw Sat Jul 05 11:41:14 2014 +0200 +++ b/eric6.pyw Sat Jul 05 12:13:23 2014 +0200 @@ -7,6 +7,6 @@ Module implementing the Windows entry point. """ -from eric5 import main +from eric6 import main main()
--- a/eric6_api.py Sat Jul 05 11:41:14 2014 +0200 +++ b/eric6_api.py Sat Jul 05 12:13:23 2014 +0200 @@ -5,7 +5,7 @@ # """ -Eric5 API Generator. +Eric6 API Generator. This is the main Python script of the API generator. It is this script that gets called via the API generation interface. @@ -37,14 +37,14 @@ It prints a reference of all commandline parameters that may be used and ends the application. """ - print("eric5_api") + print("eric6_api") print() print("Copyright (c) 2004 - 2014 Detlev Offenbach" " <detlev@die-offenbachs.de>.") print() print("Usage:") print() - print(" eric5_api [options] files...") + print(" eric6_api [options] files...") print() print("where files can be either python modules, package") print("directories or ordinary directories.") @@ -94,9 +94,9 @@ Function to show the version information. """ print( - """eric5_api {0}\n""" + """eric6_api {0}\n""" """\n""" - """Eric5 API generator.\n""" + """Eric6 API generator.\n""" """\n""" """Copyright (c) 2004 - 2014 Detlev Offenbach""" """ <detlev@die-offenbachs.de>\n""" @@ -126,7 +126,7 @@ usage() excludeDirs = ["CVS", ".svn", "_svn", ".ropeproject", "_ropeproject", - ".eric5project", "_eric5project", "dist", "build", "doc", + ".eric6project", "_eric6project", "dist", "build", "doc", "docs"] excludePatterns = [] outputFileName = ""
--- a/eric6_compare.py Sat Jul 05 11:41:14 2014 +0200 +++ b/eric6_compare.py Sat Jul 05 12:13:23 2014 +0200 @@ -5,7 +5,7 @@ # """ -Eric5 Compare. +Eric6 Compare. This is the main Python script that performs the necessary initialization of the Compare module and starts the Qt event loop. This is a standalone @@ -59,7 +59,7 @@ "use the given directory as the one containing the config files"), ] appinfo = AppInfo.makeAppInfo(sys.argv, - "Eric5 Compare", + "Eric6 Compare", "", "Simple graphical compare tool", options)
--- a/eric6_compare.pyw Sat Jul 05 11:41:14 2014 +0200 +++ b/eric6_compare.pyw Sat Jul 05 12:13:23 2014 +0200 @@ -7,6 +7,6 @@ Module implementing the Windows entry point. """ -from eric5_compare import main +from eric6_compare import main main()
--- a/eric6_configure.py Sat Jul 05 11:41:14 2014 +0200 +++ b/eric6_configure.py Sat Jul 05 12:13:23 2014 +0200 @@ -5,9 +5,9 @@ # """ -Eric5 Configure. +Eric6 Configure. -This is the main Python script to configure the eric5 IDE from the outside. +This is the main Python script to configure the eric6 IDE from the outside. """ from __future__ import unicode_literals @@ -59,9 +59,9 @@ "use the given directory as the one containing the config files"), ] appinfo = AppInfo.makeAppInfo(sys.argv, - "Eric5 Configure", + "Eric6 Configure", "", - "Configuration editor for eric5", + "Configuration editor for eric6", options) res = Startup.simpleAppStartup(sys.argv, appinfo,
--- a/eric6_configure.pyw Sat Jul 05 11:41:14 2014 +0200 +++ b/eric6_configure.pyw Sat Jul 05 12:13:23 2014 +0200 @@ -7,6 +7,6 @@ Module implementing the Windows entry point. """ -from eric5_configure import main +from eric6_configure import main main()
--- a/eric6_diff.py Sat Jul 05 11:41:14 2014 +0200 +++ b/eric6_diff.py Sat Jul 05 12:13:23 2014 +0200 @@ -5,7 +5,7 @@ # """ -Eric5 Diff. +Eric6 Diff. This is the main Python script that performs the necessary initialization of the Diff module and starts the Qt event loop. This is a standalone @@ -53,7 +53,7 @@ "use the given directory as the one containing the config files"), ] appinfo = AppInfo.makeAppInfo(sys.argv, - "Eric5 Diff", + "Eric6 Diff", "", "Simple graphical diff tool", options)
--- a/eric6_diff.pyw Sat Jul 05 11:41:14 2014 +0200 +++ b/eric6_diff.pyw Sat Jul 05 12:13:23 2014 +0200 @@ -7,6 +7,6 @@ Module implementing the Windows entry point. """ -from eric5_diff import main +from eric6_diff import main main()
--- a/eric6_doc.py Sat Jul 05 11:41:14 2014 +0200 +++ b/eric6_doc.py Sat Jul 05 12:13:23 2014 +0200 @@ -5,7 +5,7 @@ # """ -Eric5 Documentation Generator. +Eric6 Documentation Generator. This is the main Python script of the documentation generator. It is this script that gets called via the source documentation interface. @@ -27,7 +27,7 @@ from DocumentationTools.ModuleDocumentor import ModuleDocument from DocumentationTools.IndexGenerator import IndexGenerator from DocumentationTools.QtHelpGenerator import QtHelpGenerator -from DocumentationTools.Config import eric5docDefaultColors +from DocumentationTools.Config import eric6docDefaultColors from UI.Info import Version import Utilities @@ -42,14 +42,14 @@ It prints a reference of all commandline parameters that may be used and ends the application. """ - print("eric5_doc") + print("eric6_doc") print() print("Copyright (c) 2003 - 2014 Detlev Offenbach" " <detlev@die-offenbachs.de>.") print() print("Usage:") print() - print(" eric5_doc [options] files...") + print(" eric6_doc [options] files...") print() print("where files can be either python modules, package") print("directories or ordinary directories.") @@ -129,9 +129,9 @@ Function to show the version information. """ print( - """eric5_doc {0}\n""" + """eric6_doc {0}\n""" """\n""" - """Eric5 API documentation generator.\n""" + """Eric6 API documentation generator.\n""" """\n""" """Copyright (c) 2003-2014 Detlev Offenbach""" """ <detlev@die-offenbachs.de>\n""" @@ -168,7 +168,7 @@ usage() excludeDirs = ["CVS", ".svn", "_svn", ".ropeproject", "_ropeproject", - ".eric5project", "_eric5project", "dist", "build", "doc", + ".eric6project", "_eric6project", "dist", "build", "doc", "docs"] excludePatterns = [] outputDir = "doc" @@ -178,7 +178,7 @@ newline = None stylesheetFile = "" - colors = eric5docDefaultColors.copy() + colors = eric6docDefaultColors.copy() qtHelpCreation = False qtHelpOutputDir = "help"
--- a/eric6_editor.py Sat Jul 05 11:41:14 2014 +0200 +++ b/eric6_editor.py Sat Jul 05 12:13:23 2014 +0200 @@ -5,7 +5,7 @@ # """ -Eric5 Editor. +Eric6 Editor. This is the main Python script that performs the necessary initialization of the MiniEditor module and starts the Qt event loop. This is a standalone @@ -62,9 +62,9 @@ ("", "name of file to edit") ] appinfo = AppInfo.makeAppInfo(sys.argv, - "Eric5 Editor", + "Eric6 Editor", "", - "Simplified version of the eric5 editor", + "Simplified version of the eric6 editor", options) res = Startup.simpleAppStartup(sys.argv, appinfo,
--- a/eric6_editor.pyw Sat Jul 05 11:41:14 2014 +0200 +++ b/eric6_editor.pyw Sat Jul 05 12:13:23 2014 +0200 @@ -7,6 +7,6 @@ Module implementing the Windows entry point. """ -from eric5_editor import main +from eric6_editor import main main()
--- a/eric6_iconeditor.py Sat Jul 05 11:41:14 2014 +0200 +++ b/eric6_iconeditor.py Sat Jul 05 12:13:23 2014 +0200 @@ -5,7 +5,7 @@ # """ -Eric5 Icon Editor. +Eric6 Icon Editor. This is the main Python script that performs the necessary initialization of the icon editor and starts the Qt event loop. This is a standalone version @@ -61,7 +61,7 @@ ("", "name of file to edit") ] appinfo = AppInfo.makeAppInfo(sys.argv, - "Eric5 Icon Editor", + "Eric6 Icon Editor", "", "Little tool to edit icon files.", options)
--- a/eric6_iconeditor.pyw Sat Jul 05 11:41:14 2014 +0200 +++ b/eric6_iconeditor.pyw Sat Jul 05 12:13:23 2014 +0200 @@ -7,6 +7,6 @@ Module implementing the Windows entry point. """ -from eric5_iconeditor import main +from eric6_iconeditor import main main()
--- a/eric6_plugininstall.py Sat Jul 05 11:41:14 2014 +0200 +++ b/eric6_plugininstall.py Sat Jul 05 12:13:23 2014 +0200 @@ -5,9 +5,9 @@ # """ -Eric5 Plugin Installer. +Eric6 Plugin Installer. -This is the main Python script to install eric5 plugins from outside of the +This is the main Python script to install eric6 plugins from outside of the IDE. """ @@ -53,9 +53,9 @@ ("", "names of plugins to install") ] appinfo = AppInfo.makeAppInfo(sys.argv, - "Eric5 Plugin Installer", + "Eric6 Plugin Installer", "", - "Plugin installation utility for eric5", + "Plugin installation utility for eric6", options) res = Startup.simpleAppStartup(sys.argv, appinfo,
--- a/eric6_plugininstall.pyw Sat Jul 05 11:41:14 2014 +0200 +++ b/eric6_plugininstall.pyw Sat Jul 05 12:13:23 2014 +0200 @@ -7,6 +7,6 @@ Module implementing the Windows entry point. """ -from eric5_plugininstall import main +from eric6_plugininstall import main main()
--- a/eric6_pluginrepository.py Sat Jul 05 11:41:14 2014 +0200 +++ b/eric6_pluginrepository.py Sat Jul 05 12:13:23 2014 +0200 @@ -5,9 +5,9 @@ # """ -Eric5 Plugin Installer. +Eric6 Plugin Installer. -This is the main Python script to install eric5 plugins from outside of the +This is the main Python script to install eric6 plugins from outside of the IDE. """ @@ -52,9 +52,9 @@ "use the given directory as the one containing the config files"), ] appinfo = AppInfo.makeAppInfo(sys.argv, - "Eric5 Plugin Repository", + "Eric6 Plugin Repository", "", - "Utility to show the contents of the eric5" + "Utility to show the contents of the eric6" " Plugin repository.", options) res = Startup.simpleAppStartup(sys.argv,
--- a/eric6_pluginrepository.pyw Sat Jul 05 11:41:14 2014 +0200 +++ b/eric6_pluginrepository.pyw Sat Jul 05 12:13:23 2014 +0200 @@ -7,6 +7,6 @@ Module implementing the Windows entry point. """ -from eric5_pluginrepository import main +from eric6_pluginrepository import main main()
--- a/eric6_pluginuninstall.py Sat Jul 05 11:41:14 2014 +0200 +++ b/eric6_pluginuninstall.py Sat Jul 05 12:13:23 2014 +0200 @@ -5,9 +5,9 @@ # """ -Eric5 Plugin Uninstaller. +Eric6 Plugin Uninstaller. -This is the main Python script to uninstall eric5 plugins from outside of the +This is the main Python script to uninstall eric6 plugins from outside of the IDE. """ @@ -52,9 +52,9 @@ "use the given directory as the one containing the config files"), ] appinfo = AppInfo.makeAppInfo(sys.argv, - "Eric5 Plugin Uninstaller", + "Eric6 Plugin Uninstaller", "", - "Plugin uninstallation utility for eric5", + "Plugin uninstallation utility for eric6", options) res = Startup.simpleAppStartup(sys.argv, appinfo,
--- a/eric6_pluginuninstall.pyw Sat Jul 05 11:41:14 2014 +0200 +++ b/eric6_pluginuninstall.pyw Sat Jul 05 12:13:23 2014 +0200 @@ -7,6 +7,6 @@ Module implementing the Windows entry point. """ -from eric5_pluginuninstall import main +from eric6_pluginuninstall import main main()
--- a/eric6_qregexp.py Sat Jul 05 11:41:14 2014 +0200 +++ b/eric6_qregexp.py Sat Jul 05 12:13:23 2014 +0200 @@ -5,7 +5,7 @@ # """ -Eric5 QRegExp. +Eric6 QRegExp. This is the main Python script that performs the necessary initialization of the QRegExp wizard module and starts the Qt event loop. This is a standalone @@ -54,7 +54,7 @@ "use the given directory as the one containing the config files"), ] appinfo = AppInfo.makeAppInfo(sys.argv, - "Eric5 QRegExp", + "Eric6 QRegExp", "", "Regexp editor for Qt's QRegExp class", options)
--- a/eric6_qregexp.pyw Sat Jul 05 11:41:14 2014 +0200 +++ b/eric6_qregexp.pyw Sat Jul 05 12:13:23 2014 +0200 @@ -7,6 +7,6 @@ Module implementing the Windows entry point. """ -from eric5_qregexp import main +from eric6_qregexp import main main()
--- a/eric6_qregularexpression.py Sat Jul 05 11:41:14 2014 +0200 +++ b/eric6_qregularexpression.py Sat Jul 05 12:13:23 2014 +0200 @@ -5,7 +5,7 @@ # """ -Eric5 QRegularExpression. +Eric6 QRegularExpression. This is the main Python script that performs the necessary initialization of the QRegularExpression wizard module and starts the Qt event loop. This is @@ -56,7 +56,7 @@ ] appinfo = AppInfo.makeAppInfo( sys.argv, - "Eric5 QRegularExpression", + "Eric6 QRegularExpression", "", "Regexp editor for Qt's QRegularExpression class", options)
--- a/eric6_qregularexpression.pyw Sat Jul 05 11:41:14 2014 +0200 +++ b/eric6_qregularexpression.pyw Sat Jul 05 12:13:23 2014 +0200 @@ -7,6 +7,6 @@ Module implementing the Windows entry point. """ -from eric5_qregularexpression import main +from eric6_qregularexpression import main main()
--- a/eric6_re.py Sat Jul 05 11:41:14 2014 +0200 +++ b/eric6_re.py Sat Jul 05 12:13:23 2014 +0200 @@ -5,7 +5,7 @@ # """ -Eric5 Re. +Eric6 Re. This is the main Python script that performs the necessary initialization of the PyRegExp wizard module and starts the Qt event loop. This is a @@ -54,7 +54,7 @@ "use the given directory as the one containing the config files"), ] appinfo = AppInfo.makeAppInfo(sys.argv, - "Eric5 RE", + "Eric6 RE", "", "Regexp editor for the Python re module", options)
--- a/eric6_re.pyw Sat Jul 05 11:41:14 2014 +0200 +++ b/eric6_re.pyw Sat Jul 05 12:13:23 2014 +0200 @@ -7,6 +7,6 @@ Module implementing the Windows entry point. """ -from eric5_re import main +from eric6_re import main main()
--- a/eric6_snap.py Sat Jul 05 11:41:14 2014 +0200 +++ b/eric6_snap.py Sat Jul 05 12:13:23 2014 +0200 @@ -5,7 +5,7 @@ # """ -Eric5 Snap. +Eric6 Snap. This is the main Python script that performs the necessary initialization of the snapshot module and starts the Qt event loop. @@ -53,7 +53,7 @@ ] appinfo = AppInfo.makeAppInfo( sys.argv, - "Eric5 Snap", + "Eric6 Snap", "", "Simple utility to do snapshots of the screen.", options)
--- a/eric6_snap.pyw Sat Jul 05 11:41:14 2014 +0200 +++ b/eric6_snap.pyw Sat Jul 05 12:13:23 2014 +0200 @@ -7,6 +7,6 @@ Module implementing the Windows entry point. """ -from eric5_snap import main +from eric6_snap import main main()
--- a/eric6_sqlbrowser.py Sat Jul 05 11:41:14 2014 +0200 +++ b/eric6_sqlbrowser.py Sat Jul 05 12:13:23 2014 +0200 @@ -5,7 +5,7 @@ # """ -Eric5 SQL Browser. +Eric6 SQL Browser. This is the main Python script that performs the necessary initialization of the SQL browser and starts the Qt event loop. @@ -59,7 +59,7 @@ "use the given directory as the one containing the config files"), ] appinfo = AppInfo.makeAppInfo(sys.argv, - "Eric5 SQL Browser", + "Eric6 SQL Browser", "connection", "SQL browser", options)
--- a/eric6_sqlbrowser.pyw Sat Jul 05 11:41:14 2014 +0200 +++ b/eric6_sqlbrowser.pyw Sat Jul 05 12:13:23 2014 +0200 @@ -7,6 +7,6 @@ Module implementing the Windows entry point. """ -from eric5_sqlbrowser import main +from eric6_sqlbrowser import main main()
--- a/eric6_tray.py Sat Jul 05 11:41:14 2014 +0200 +++ b/eric6_tray.py Sat Jul 05 12:13:23 2014 +0200 @@ -5,11 +5,11 @@ # """ -Eric5 Tray. +Eric6 Tray. This is the main Python script that performs the necessary initialization of the system-tray application. This acts as a quickstarter by providing a -context menu to start the eric5 IDE and the eric5 tools. +context menu to start the eric6 IDE and the eric6 tools. """ from __future__ import unicode_literals @@ -53,9 +53,9 @@ "use the given directory as the one containing the config files"), ] appinfo = AppInfo.makeAppInfo(sys.argv, - "Eric5 Tray", + "Eric6 Tray", "", - "Traystarter for eric5", + "Traystarter for eric6", options) res = Startup.simpleAppStartup(sys.argv, appinfo,
--- a/eric6_tray.pyw Sat Jul 05 11:41:14 2014 +0200 +++ b/eric6_tray.pyw Sat Jul 05 12:13:23 2014 +0200 @@ -7,6 +7,6 @@ Module implementing the Windows entry point. """ -from eric5_tray import main +from eric6_tray import main main()
--- a/eric6_trpreviewer.py Sat Jul 05 11:41:14 2014 +0200 +++ b/eric6_trpreviewer.py Sat Jul 05 12:13:23 2014 +0200 @@ -5,7 +5,7 @@ # """ -Eric5 TR Previewer. +Eric6 TR Previewer. This is the main Python script that performs the necessary initialization of the tr previewer and starts the Qt event loop. This is a standalone version @@ -63,7 +63,7 @@ "use the given directory as the one containing the config files"), ] appinfo = AppInfo.makeAppInfo(sys.argv, - "Eric5 TR Previewer", + "Eric6 TR Previewer", "file", "TR file previewer", options) @@ -76,7 +76,7 @@ client.processArgs(sys.argv[1:]) sys.exit(0) elif res < 0: - print("eric5_trpreviewer: {0}".format(client.errstr())) + print("eric6_trpreviewer: {0}".format(client.errstr())) sys.exit(res) else: res = Startup.simpleAppStartup(sys.argv,
--- a/eric6_trpreviewer.pyw Sat Jul 05 11:41:14 2014 +0200 +++ b/eric6_trpreviewer.pyw Sat Jul 05 12:13:23 2014 +0200 @@ -7,6 +7,6 @@ Module implementing the Windows entry point. """ -from eric5_trpreviewer import main +from eric6_trpreviewer import main main()
--- a/eric6_uipreviewer.py Sat Jul 05 11:41:14 2014 +0200 +++ b/eric6_uipreviewer.py Sat Jul 05 12:13:23 2014 +0200 @@ -5,7 +5,7 @@ # """ -Eric5 UI Previewer. +Eric6 UI Previewer. This is the main Python script that performs the necessary initialization of the ui previewer and starts the Qt event loop. This is a standalone version @@ -60,7 +60,7 @@ "use the given directory as the one containing the config files"), ] appinfo = AppInfo.makeAppInfo(sys.argv, - "Eric5 UI Previewer", + "Eric6 UI Previewer", "file", "UI file previewer", options)
--- a/eric6_uipreviewer.pyw Sat Jul 05 11:41:14 2014 +0200 +++ b/eric6_uipreviewer.pyw Sat Jul 05 12:13:23 2014 +0200 @@ -7,6 +7,6 @@ Module implementing the Windows entry point. """ -from eric5_uipreviewer import main +from eric6_uipreviewer import main main()
--- a/eric6_unittest.py Sat Jul 05 11:41:14 2014 +0200 +++ b/eric6_unittest.py Sat Jul 05 12:13:23 2014 +0200 @@ -5,7 +5,7 @@ # """ -Eric5 Unittest. +Eric6 Unittest. This is the main Python script that performs the necessary initialization of the unittest module and starts the Qt event loop. This is a standalone @@ -57,7 +57,7 @@ "use the given directory as the one containing the config files"), ] appinfo = AppInfo.makeAppInfo(sys.argv, - "Eric5 Unittest", + "Eric6 Unittest", "file", "Graphical unit test application", options)
--- a/eric6_unittest.pyw Sat Jul 05 11:41:14 2014 +0200 +++ b/eric6_unittest.pyw Sat Jul 05 12:13:23 2014 +0200 @@ -7,6 +7,6 @@ Module implementing the Windows entry point. """ -from eric5_unittest import main +from eric6_unittest import main main()
--- a/eric6_webbrowser.py Sat Jul 05 11:41:14 2014 +0200 +++ b/eric6_webbrowser.py Sat Jul 05 12:13:23 2014 +0200 @@ -5,7 +5,7 @@ # """ -Eric5 Web Browser. +Eric6 Web Browser. This is the main Python script that performs the necessary initialization of the web browser and starts the Qt event loop. This is a standalone version @@ -81,7 +81,7 @@ ("--search=word", "search for the given word") ] appinfo = AppInfo.makeAppInfo(sys.argv, - "eric5 Web Browser", + "eric6 Web Browser", "file", "web browser", options)
--- a/eric6_webbrowser.pyw Sat Jul 05 11:41:14 2014 +0200 +++ b/eric6_webbrowser.pyw Sat Jul 05 12:13:23 2014 +0200 @@ -7,6 +7,6 @@ Module implementing the Windows entry point. """ -from eric5_webbrowser import main +from eric6_webbrowser import main main()
--- a/eric6config.py Sat Jul 05 11:41:14 2014 +0200 +++ b/eric6config.py Sat Jul 05 12:13:23 2014 +0200 @@ -4,7 +4,7 @@ # """ -Module containing the default configuration of the eric5 installation. +Module containing the default configuration of the eric6 installation. """ from __future__ import unicode_literals
--- a/install-i18n.py Sat Jul 05 11:41:14 2014 +0200 +++ b/install-i18n.py Sat Jul 05 12:13:23 2014 +0200 @@ -3,10 +3,10 @@ # Copyright (c) 2004 - 2014 Detlev Offenbach <detlev@die-offenbachs.de> # -# This is the install script for eric5's translation files. +# This is the install script for eric6's translation files. """ -Installation script for the eric5 IDE translation files. +Installation script for the eric6 IDE translation files. """ from __future__ import unicode_literals @@ -19,9 +19,9 @@ from PyQt5.QtCore import QDir try: - from eric5config import getConfig + from eric6config import getConfig except ImportError: - print("The eric5 IDE doesn't seem to be installed. Aborting.") + print("The eric6 IDE doesn't seem to be installed. Aborting.") sys.exit(1) @@ -32,9 +32,9 @@ @return directory name of the config dir (string) """ if sys.platform.startswith("win"): - cdn = "_eric5" + cdn = "_eric6" else: - cdn = ".eric5" + cdn = ".eric6" hp = QDir.homePath() dn = QDir(hp) @@ -128,5 +128,5 @@ except: print("""An internal error occured. Please report all the output of""" """ the program,\nincluding the following traceback, to""" - """ eric5-bugs@eric-ide.python-projects.org.\n""") + """ eric-bugs@eric-ide.python-projects.org.\n""") raise
--- a/install.py Sat Jul 05 11:41:14 2014 +0200 +++ b/install.py Sat Jul 05 12:13:23 2014 +0200 @@ -3,10 +3,10 @@ # Copyright (c) 2002-2014 Detlev Offenbach <detlev@die-offenbachs.de> # -# This is the install script for eric5. +# This is the install script for eric6. """ -Installation script for the eric5 IDE and all eric5 related tools. +Installation script for the eric6 IDE and all eric6 related tools. """ from __future__ import unicode_literals @@ -41,9 +41,9 @@ cfg = {} progLanguages = ["Python", "Ruby", "QSS"] sourceDir = "eric" -configName = 'eric5config.py' -defaultMacAppBundleName = "eric5.app" -macAppBundleName = "eric5.app" +configName = 'eric6config.py' +defaultMacAppBundleName = "eric6.app" +macAppBundleName = "eric6.app" macAppBundlePath = "/Applications" macPythonExe = "{0}/Resources/Python.app/Contents/MacOS/Python".format( sys.exec_prefix) @@ -130,7 +130,7 @@ print(" (no default value)") print(" -b dir where the binaries will be installed") print(" (default: {0})".format(platBinDir)) - print(" -d dir where eric5 python files will be installed") + print(" -d dir where eric6 python files will be installed") print(" (default: {0})".format(modDir)) print(" -f file configuration file naming the various installation" " paths") @@ -160,7 +160,7 @@ print("'ericTranslationsDir', 'ericTemplatesDir', 'ericCodeTemplatesDir',") print("'ericOthersDir','bindir', 'mdir' and 'apidir.") print("These define the directories for the installation of the various" - " parts of eric5.") + " parts of eric6.") exit(rcode) @@ -334,7 +334,7 @@ """ global cfg, distDir - pdir = os.path.join(cfg['mdir'], "eric5plugins") + pdir = os.path.join(cfg['mdir'], "eric6plugins") fname = os.path.join(pdir, "__init__.py") if not os.path.exists(fname): if not os.path.exists(pdir): @@ -392,9 +392,9 @@ global macAppBundleName, macAppBundlePath, platBinDir, includePythonVariant try: - from eric5config import getConfig + from eric6config import getConfig except ImportError: - # eric5 wasn't installed previously + # eric6 wasn't installed previously return global pyModDir, progLanguages @@ -402,38 +402,38 @@ # Remove the menu entry for Linux systems if sys.platform.startswith("linux"): for name in ["/usr/share/pixmaps/eric.png", - "/usr/share/applications/eric5.desktop", - "/usr/share/appdata/eric5.appdata.xml", + "/usr/share/applications/eric6.desktop", + "/usr/share/appdata/eric6.appdata.xml", "/usr/share/pixmaps/ericWeb.png", - "/usr/share/applications/eric5_webbrowser.desktop"]: + "/usr/share/applications/eric6_webbrowser.desktop"]: if os.path.exists(name): os.remove(name) # Remove the wrapper scripts rem_wnames = [ - "eric5-api", "eric5-compare", - "eric5-configure", "eric5-diff", - "eric5-doc", - "eric5-qregexp", "eric5-re", - "eric5-trpreviewer", "eric5-uipreviewer", - "eric5-unittest", "eric5", - "eric5-tray", "eric5-editor", - "eric5-plugininstall", "eric5-pluginuninstall", - "eric5-pluginrepository", "eric5-sqlbrowser", - "eric5-webbrowser", "eric5-iconeditor", + "eric6-api", "eric6-compare", + "eric6-configure", "eric6-diff", + "eric6-doc", + "eric6-qregexp", "eric6-re", + "eric6-trpreviewer", "eric6-uipreviewer", + "eric6-unittest", "eric6", + "eric6-tray", "eric6-editor", + "eric6-plugininstall", "eric6-pluginuninstall", + "eric6-pluginrepository", "eric6-sqlbrowser", + "eric6-webbrowser", "eric6-iconeditor", ] rem_wnames2 = [ - "eric5_api", "eric5_compare", - "eric5_configure", "eric5_diff", - "eric5_doc", "eric5_qregularexpression", - "eric5_qregexp", "eric5_re", - "eric5_trpreviewer", "eric5_uipreviewer", - "eric5_unittest", "eric5", - "eric5_tray", "eric5_editor", - "eric5_plugininstall", "eric5_pluginuninstall", - "eric5_pluginrepository", "eric5_sqlbrowser", - "eric5_webbrowser", "eric5_iconeditor", - "eric5_snap", + "eric6_api", "eric6_compare", + "eric6_configure", "eric6_diff", + "eric6_doc", "eric6_qregularexpression", + "eric6_qregexp", "eric6_re", + "eric6_trpreviewer", "eric6_uipreviewer", + "eric6_unittest", "eric6", + "eric6_tray", "eric6_editor", + "eric6_plugininstall", "eric6_pluginuninstall", + "eric6_pluginrepository", "eric6_sqlbrowser", + "eric6_webbrowser", "eric6_iconeditor", + "eric6_snap", ] if includePythonVariant: marker = PythonMarkers[sys.version_info.major] @@ -449,7 +449,7 @@ os.remove(rwname) # Cleanup our config file(s) - for name in ['eric5config.py', 'eric5config.pyc', 'eric5.pth']: + for name in ['eric6config.py', 'eric6config.pyc', 'eric6.pth']: e5cfile = os.path.join(pyModDir, name) if os.path.exists(e5cfile): os.remove(e5cfile) @@ -468,7 +468,7 @@ # Cleanup translations for name in glob.glob( - os.path.join(getConfig('ericTranslationsDir'), 'eric5_*.qm')): + os.path.join(getConfig('ericTranslationsDir'), 'eric6_*.qm')): if os.path.exists(name): os.remove(name) @@ -488,14 +488,14 @@ if sys.platform == "darwin": # delete the Mac app bundle - if os.path.exists("/Developer/Applications/Eric5"): - shutil.rmtree("/Developer/Applications/Eric5") + if os.path.exists("/Developer/Applications/Eric6"): + shutil.rmtree("/Developer/Applications/Eric6") try: macAppBundlePath = getConfig("macAppBundlePath") macAppBundleName = getConfig("macAppBundleName") except AttributeError: macAppBundlePath = "/Applications" - macAppBundleName = "eric5.app" + macAppBundleName = "eric6.app" if os.path.exists("/Applications/" + macAppBundleName): shutil.rmtree("/Applications/" + macAppBundleName) bundlePath = os.path.join(macAppBundlePath, macAppBundleName) @@ -531,15 +531,15 @@ # Create the platform specific wrappers. wnames = [] - for name in ["eric5_api", "eric5_doc"]: + for name in ["eric6_api", "eric6_doc"]: wnames.append(createPyWrapper(cfg['ericDir'], name, False)) - for name in ["eric5_compare", "eric5_configure", "eric5_diff", - "eric5_editor", "eric5_iconeditor", "eric5_plugininstall", - "eric5_pluginrepository", "eric5_pluginuninstall", - "eric5_qregexp", "eric5_qregularexpression", "eric5_re", - "eric5_snap", "eric5_sqlbrowser", "eric5_tray", - "eric5_trpreviewer", "eric5_uipreviewer", "eric5_unittest", - "eric5_webbrowser", "eric5"]: + for name in ["eric6_compare", "eric6_configure", "eric6_diff", + "eric6_editor", "eric6_iconeditor", "eric6_plugininstall", + "eric6_pluginrepository", "eric6_pluginuninstall", + "eric6_qregexp", "eric6_qregularexpression", "eric6_re", + "eric6_snap", "eric6_sqlbrowser", "eric6_tray", + "eric6_trpreviewer", "eric6_uipreviewer", "eric6_unittest", + "eric6_webbrowser", "eric6"]: wnames.append(createPyWrapper(cfg['ericDir'], name)) # set install prefix, if not None @@ -554,7 +554,7 @@ if not os.path.isdir(cfg[key]): os.makedirs(cfg[key]) - # copy the eric5 config file + # copy the eric6 config file if distDir: shutilCopy(configName, cfg['mdir']) if os.path.exists(configName + 'c'): @@ -564,12 +564,12 @@ if os.path.exists(configName + 'c'): shutilCopy(configName + 'c', modDir) - # copy the various parts of eric5 + # copy the various parts of eric6 copyTree( sourceDir, cfg['ericDir'], ['*.py', '*.pyc', '*.pyo', '*.pyw'], ['{1}{0}Examples'.format(os.sep, sourceDir)], - excludePatterns=["eric5config.py*"]) + excludePatterns=["eric6config.py*"]) copyTree( sourceDir, cfg['ericDir'], ['*.rb'], ['{1}{0}Examples'.format(os.sep, sourceDir)]) @@ -699,30 +699,30 @@ os.path.join(distDir, "usr/share/applications")) if not os.path.exists(dst): os.makedirs(dst) - shutilCopy(os.path.join(sourceDir, "eric5.desktop"), dst) - shutilCopy(os.path.join(sourceDir, "eric5_webbrowser.desktop"), + shutilCopy(os.path.join(sourceDir, "eric6.desktop"), dst) + shutilCopy(os.path.join(sourceDir, "eric6_webbrowser.desktop"), dst) dst = os.path.normpath( os.path.join(distDir, "usr/share/appdata")) if not os.path.exists(dst): os.makedirs(dst) - shutilCopy(os.path.join(sourceDir, "eric5.appdata.xml"), dst) + shutilCopy(os.path.join(sourceDir, "eric6.appdata.xml"), dst) else: shutilCopy(os.path.join( sourceDir, "icons", "default", "eric.png"), "/usr/share/pixmaps/eric.png") shutilCopy(os.path.join( - sourceDir, "eric5.desktop"), + sourceDir, "eric6.desktop"), "/usr/share/applications") if os.path.exists("/usr/share/appdata"): shutilCopy(os.path.join( - sourceDir, "eric5.appdata.xml"), + sourceDir, "eric6.appdata.xml"), "/usr/share/appdata") shutilCopy(os.path.join( sourceDir, "icons", "default", "ericWeb48.png"), "/usr/share/pixmaps/ericWeb.png") shutilCopy(os.path.join( - sourceDir, "eric5_webbrowser.desktop"), + sourceDir, "eric6_webbrowser.desktop"), "/usr/share/applications") # Create a Mac application bundle @@ -759,7 +759,7 @@ else: starter = "python{0}".format(sys.version_info.major) - wname = os.path.join(dirs["exe"], "eric5") + wname = os.path.join(dirs["exe"], "eric6") path = os.getenv("PATH", "") if path: pybin = os.path.join(sys.exec_prefix, "bin") @@ -771,12 +771,12 @@ '''\n''' '''PATH={0}\n''' '''exec "{1}" "{2}/{3}.py" "$@"\n''' - .format(path, starter, pydir, "eric5")) + .format(path, starter, pydir, "eric6")) else: wrapper = ('''#!/bin/sh\n''' '''\n''' '''exec "{0}" "{1}/{2}.py" "$@"\n''' - .format(starter, pydir, "eric5")) + .format(starter, pydir, "eric6")) copyToFile(wname, wrapper) os.chmod(wname, 0o755) @@ -791,7 +791,7 @@ '''<plist version="1.0">\n''' '''<dict>\n''' ''' <key>CFBundleExecutable</key>\n''' - ''' <string>eric5</string>\n''' + ''' <string>eric6</string>\n''' ''' <key>CFBundleIconFile</key>\n''' ''' <string>eric.icns</string>\n''' ''' <key>CFBundleInfoDictionaryVersion</key>\n''' @@ -816,7 +816,7 @@ """ global modDir, platBinDir, cfg, apisDir - ericdir = os.path.join(modDir, "eric5") + ericdir = os.path.join(modDir, "eric6") cfg = { 'ericDir': ericdir, 'ericPixDir': os.path.join(ericdir, "pixmaps"), @@ -857,11 +857,11 @@ os.path.join(sourceDir, "APIs", "Python3", "*.api")): apis.append(os.path.basename(apiName)) - fn = 'eric5config.py' + fn = 'eric6config.py' config = ( """# -*- coding: utf-8 -*-\n""" """#\n""" - """# This module contains the configuration of the individual eric5""" + """# This module contains the configuration of the individual eric6""" """ installation\n""" """#\n""" """\n""" @@ -928,7 +928,7 @@ print('Sorry, you must have Python 3.1.0 or higher.') exit(5) if sys.version_info > (3, 9, 9): - print('Sorry, eric5 requires Python 3 or Python 2 for running.') + print('Sorry, eric6 requires Python 3 or Python 2 for running.') exit(5) print("Python Version: {0:d}.{1:d}.{2:d}".format(*sys.version_info[:3])) @@ -1012,7 +1012,7 @@ for vers in BlackLists["sip"] + PlatformBlackLists["sip"]: if vers == sipVersion: print( - 'Sorry, sip version {0} is not compatible with eric5.' + 'Sorry, sip version {0} is not compatible with eric6.' .format(vers)) print('Please install another version.') exit(3) @@ -1037,7 +1037,7 @@ # check for blacklisted versions for vers in BlackLists["PyQt5"] + PlatformBlackLists["PyQt5"]: if vers == pyqtVersion: - print('Sorry, PyQt5 version {0} is not compatible with eric5.' + print('Sorry, PyQt5 version {0} is not compatible with eric6.' .format(vers)) print('Please install another version.') exit(4) @@ -1064,7 +1064,7 @@ if vers == scintillaVersion: print( 'Sorry, QScintilla2 version {0} is not compatible with' - ' eric5.'.format(vers)) + ' eric6.'.format(vers)) print('Please install another version.') exit(5) print("QScintilla Version: ", QSCINTILLA_VERSION_STR) @@ -1177,7 +1177,7 @@ global macAppBundlePath, macAppBundleName, macPythonExe if sys.version_info < (2, 6, 0) or sys.version_info > (3, 9, 9): - print('Sorry, eric5 requires at least Python 2.6 or ' + print('Sorry, eric6 requires at least Python 2.6 or ' 'Python 3 for running.') exit(5) @@ -1240,7 +1240,7 @@ installFromSource = not os.path.isdir(sourceDir) if installFromSource: sourceDir = os.path.dirname(__file__) or "." - configName = os.path.join(sourceDir, "eric5config.py") + configName = os.path.join(sourceDir, "eric6config.py") if len(cfg) == 0: createInstallConfig() @@ -1302,7 +1302,7 @@ quiet=True) py_compile.compile( configName, - dfile=os.path.join(distDir, modDir, "eric5config.py")) + dfile=os.path.join(distDir, modDir, "eric6config.py")) else: compileall.compile_dir( sourceDir, @@ -1310,9 +1310,9 @@ rx=re.compile(r"DebugClients[\\/]Python[\\/]"), quiet=True) py_compile.compile(configName, - dfile=os.path.join(modDir, "eric5config.py")) + dfile=os.path.join(modDir, "eric6config.py")) sys.stdout = sys.__stdout__ - print("\nInstalling eric5 ...") + print("\nInstalling eric6 ...") res = installEric() # do some cleanup @@ -1340,5 +1340,5 @@ except: print("""An internal error occured. Please report all the output""" """ of the program,\nincluding the following traceback, to""" - """ eric5-bugs@eric-ide.python-projects.org.\n""") + """ eric-bugs@eric-ide.python-projects.org.\n""") raise
--- a/patch_modpython.py Sat Jul 05 11:41:14 2014 +0200 +++ b/patch_modpython.py Sat Jul 05 12:13:23 2014 +0200 @@ -2,10 +2,10 @@ # Copyright (c) 2003-2014 Detlev Offenbach <detlev@die-offenbachs.de> # -# This is a script to patch mod_python for eric5. +# This is a script to patch mod_python for eric6. """ -Script to patch mod_python for usage with the eric5 IDE. +Script to patch mod_python for usage with the eric6 IDE. """ from __future__ import unicode_literals @@ -38,7 +38,7 @@ print() print("This script patches the file apache.py of the Mod_python" " distribution") - print("so that it will work with the eric5 debugger instead of pdb.") + print("so that it will work with the eric6 debugger instead of pdb.") print("Please see mod_python.html for more details.") print() @@ -99,11 +99,11 @@ s = open(sn, "w", encoding="utf-8") for line in lines: if not pdbFound and line.startswith("import pdb"): - s.write("import eric5.DebugClients.Python.eric5dbgstub as pdb\n") + s.write("import eric6.DebugClients.Python.eric6dbgstub as pdb\n") pdbFound = True else: s.write(line) - if line.startswith("import eric5"): + if line.startswith("import eric6"): ericFound = True if not ericFound: @@ -112,7 +112,7 @@ s.write(' """\n') s.write(' Initialize the debugger and set the script name to be' ' reported \n') - s.write(' by the debugger. This is a patch for eric5.\n') + s.write(' by the debugger. This is a patch for eric6.\n') s.write(' """\n') s.write(' if not pdb.initDebugger("standard"):\n') s.write(' raise ImportError("Could not initialize debugger")\n') @@ -121,7 +121,7 @@ s.close() if ericFound: - print("Mod_python is already patched for eric5.") + print("Mod_python is already patched for eric6.") os.remove(sn) else: try:
--- a/uninstall.py Sat Jul 05 11:41:14 2014 +0200 +++ b/uninstall.py Sat Jul 05 12:13:23 2014 +0200 @@ -3,10 +3,10 @@ # Copyright (c) 2002 - 2014 Detlev Offenbach <detlev@die-offenbachs.de> # -# This is the uninstall script for eric5. +# This is the uninstall script for eric6. """ -Uninstallation script for the eric5 IDE and all eric5 related tools. +Uninstallation script for the eric6 IDE and all eric6 related tools. """ from __future__ import unicode_literals @@ -17,10 +17,10 @@ import glob import distutils.sysconfig -# get a local eric5config.py out of the way -if os.path.exists("eric5config.py"): - os.rename("eric5config.py", "eric5config.py.orig") -from eric5config import getConfig +# get a local eric6config.py out of the way +if os.path.exists("eric6config.py"): + os.rename("eric6config.py", "eric6config.py.orig") +from eric6config import getConfig # Define the globals. progName = None @@ -41,11 +41,11 @@ @param rcode result code to report back (integer) """ - # restore the local eric5config.py - if os.path.exists("eric5config.py.orig"): - if os.path.exists("eric5config.py"): - os.remove("eric5config.py") - os.rename("eric5config.py.orig", "eric5config.py") + # restore the local eric6config.py + if os.path.exists("eric6config.py.orig"): + if os.path.exists("eric6config.py"): + os.remove("eric6config.py") + os.rename("eric6config.py.orig", "eric6config.py") def usage(rcode=2): @@ -99,37 +99,37 @@ # Remove the menu entry for Linux systems if sys.platform.startswith("linux"): for name in ["/usr/share/pixmaps/eric.png", - "/usr/share/applications/eric5.desktop", + "/usr/share/applications/eric6.desktop", "/usr/share/pixmaps/ericWeb.png", - "/usr/share/applications/eric5_webbrowser.desktop"]: + "/usr/share/applications/eric6_webbrowser.desktop"]: if os.path.exists(name): os.remove(name) # Remove the wrapper scripts rem_wnames = [ - "eric5-api", "eric5-compare", - "eric5-configure", "eric5-diff", - "eric5-doc", - "eric5-qregexp", "eric5-re", - "eric5-trpreviewer", "eric5-uipreviewer", - "eric5-unittest", "eric5", - "eric5-tray", "eric5-editor", - "eric5-plugininstall", "eric5-pluginuninstall", - "eric5-pluginrepository", "eric5-sqlbrowser", - "eric5-webbrowser", "eric5-iconeditor", + "eric6-api", "eric6-compare", + "eric6-configure", "eric6-diff", + "eric6-doc", + "eric6-qregexp", "eric6-re", + "eric6-trpreviewer", "eric6-uipreviewer", + "eric6-unittest", "eric6", + "eric6-tray", "eric6-editor", + "eric6-plugininstall", "eric6-pluginuninstall", + "eric6-pluginrepository", "eric6-sqlbrowser", + "eric6-webbrowser", "eric6-iconeditor", ] rem_wnames2 = [ - "eric5_api", "eric5_compare", - "eric5_configure", "eric5_diff", - "eric5_doc", "eric5_qregularexpression", - "eric5_qregexp", "eric5_re", - "eric5_trpreviewer", "eric5_uipreviewer", - "eric5_unittest", "eric5", - "eric5_tray", "eric5_editor", - "eric5_plugininstall", "eric5_pluginuninstall", - "eric5_pluginrepository", "eric5_sqlbrowser", - "eric5_webbrowser", "eric5_iconeditor", - "eric5_snap", + "eric6_api", "eric6_compare", + "eric6_configure", "eric6_diff", + "eric6_doc", "eric6_qregularexpression", + "eric6_qregexp", "eric6_re", + "eric6_trpreviewer", "eric6_uipreviewer", + "eric6_unittest", "eric6", + "eric6_tray", "eric6_editor", + "eric6_plugininstall", "eric6_pluginuninstall", + "eric6_pluginrepository", "eric6_sqlbrowser", + "eric6_webbrowser", "eric6_iconeditor", + "eric6_snap", ] if includePythonVariant: marker = PythonMarkers[sys.version_info.major] @@ -144,7 +144,7 @@ os.remove(rwname) # Cleanup our config file(s) - for name in ['eric5config.py', 'eric5config.pyc', 'eric5.pth']: + for name in ['eric6config.py', 'eric6config.pyc', 'eric6.pth']: e5cfile = os.path.join(pyModDir, name) if os.path.exists(e5cfile): os.remove(e5cfile) @@ -164,7 +164,7 @@ # Cleanup translations for name in glob.glob( - os.path.join(getConfig('ericTranslationsDir'), 'eric5_*.qm')): + os.path.join(getConfig('ericTranslationsDir'), 'eric6_*.qm')): if os.path.exists(name): os.remove(name) @@ -181,14 +181,14 @@ if sys.platform == "darwin": # delete the Mac app bundle - if os.path.exists("/Developer/Applications/Eric5"): - shutil.rmtree("/Developer/Applications/Eric5") + if os.path.exists("/Developer/Applications/Eric6"): + shutil.rmtree("/Developer/Applications/Eric6") try: macAppBundlePath = getConfig("macAppBundlePath") macAppBundleName = getConfig("macAppBundleName") except AttributeError: macAppBundlePath = "/Applications" - macAppBundleName = "eric5.app" + macAppBundleName = "eric6.app" if os.path.exists("/Applications/" + macAppBundleName): shutil.rmtree("/Applications/" + macAppBundleName) bundlePath = os.path.join(macAppBundlePath, macAppBundleName) @@ -250,5 +250,5 @@ print("""An internal error occured. Please report all the output of""" """ the program,\n""" """including the following traceback, to""" - """ eric5-bugs@eric-ide.python-projects.org.\n""") + """ eric-bugs@eric-ide.python-projects.org.\n""") raise
