Sun, 24 Jun 2018 13:51:26 +0200
Globals: removed an obsolete global function.
--- a/APIs/Python3/eric6.api Sun Jun 24 13:21:52 2018 +0200 +++ b/APIs/Python3/eric6.api Sun Jun 24 13:51:26 2018 +0200 @@ -1673,7 +1673,6 @@ eric6.Globals.compatibility_fixes.open?4(filein, mode='r', buffering=-1, encoding=None, errors=None, newline=None, closefd=True) eric6.Globals.configDir?7 eric6.Globals.desktopName?4() -eric6.Globals.findPythonInterpreters?4(pyVersion) eric6.Globals.getConfigDir?4() eric6.Globals.getPyQt5ModulesDirectory?4() eric6.Globals.getPyQtToolsPath?4(version=5)
--- a/Documentation/Help/source.qhp Sun Jun 24 13:21:52 2018 +0200 +++ b/Documentation/Help/source.qhp Sun Jun 24 13:51:26 2018 +0200 @@ -18694,7 +18694,6 @@ <keyword name="filterAnsiSequences" id="filterAnsiSequences" ref="eric6.Utilities.__init__.html#filterAnsiSequences" /> <keyword name="filterCharsFromFilename" id="filterCharsFromFilename" ref="eric6.Helpviewer.HelpUtilities.html#filterCharsFromFilename" /> <keyword name="filterCharsFromFilename" id="filterCharsFromFilename" ref="eric6.WebBrowser.Tools.WebBrowserTools.html#filterCharsFromFilename" /> - <keyword name="findPythonInterpreters" id="findPythonInterpreters" ref="eric6.Globals.__init__.html#findPythonInterpreters" /> <keyword name="find_module" id="find_module" ref="eric6.Utilities.ClassBrowsers.__init__.html#find_module" /> <keyword name="find_module" id="find_module" ref="eric6.Utilities.ModuleParser.html#find_module" /> <keyword name="find_moduleAsStr" id="find_moduleAsStr" ref="eric6.Globals.compatibility_fixes.html#find_moduleAsStr" />
--- a/Documentation/Source/eric6.Globals.__init__.html Sun Jun 24 13:21:52 2018 +0200 +++ b/Documentation/Source/eric6.Globals.__init__.html Sun Jun 24 13:51:26 2018 +0200 @@ -40,9 +40,6 @@ <td><a href="#desktopName">desktopName</a></td> <td>Function to determine the name of the desktop environment used (Linux only).</td> </tr><tr> -<td><a href="#findPythonInterpreters">findPythonInterpreters</a></td> -<td>Module function for searching a Python interpreter.</td> -</tr><tr> <td><a href="#getConfigDir">getConfigDir</a></td> <td>Module function to get the name of the directory storing the config data.</td> </tr><tr> @@ -131,24 +128,6 @@ </dl> <div align="right"><a href="#top">Up</a></div> <hr /><hr /> -<a NAME="findPythonInterpreters" ID="findPythonInterpreters"></a> -<h2>findPythonInterpreters</h2> -<b>findPythonInterpreters</b>(<i>pyVersion</i>) -<p> - Module function for searching a Python interpreter. -</p><dl> -<dt><i>pyVersion</i></dt> -<dd> -major Python version -</dd> -</dl><dl> -<dt>Returns:</dt> -<dd> -list of interpreters found (list of strings) -</dd> -</dl> -<div align="right"><a href="#top">Up</a></div> -<hr /><hr /> <a NAME="getConfigDir" ID="getConfigDir"></a> <h2>getConfigDir</h2> <b>getConfigDir</b>(<i></i>)
--- a/Globals/__init__.py Sun Jun 24 13:21:52 2018 +0200 +++ b/Globals/__init__.py Sun Jun 24 13:51:26 2018 +0200 @@ -305,51 +305,6 @@ ############################################################################### -## functions for searching a Python2/3 interpreter -############################################################################### - - -# TODO: improve this analog to the one found in the old PluginPipInterface -def findPythonInterpreters(pyVersion): - """ - Module function for searching a Python interpreter. - - @param pyVersion major Python version - @return list of interpreters found (list of strings) - """ - if pyVersion == 2: - winPathList = ["C:\\Python25", "C:\\Python26", - "C:\\Python27", "C:\\Python28"] - posixVersionsList = ["2.5", "2.6", "2.7", "2.8"] - else: - winPathList = ["C:\\Python3{0}".format(x) for x in range(11)] - posixVersionsList = ["3.{0}".format(x) for x in range(11)] - posixPathList = ["/usr/bin", "/usr/local/bin"] - - interpreters = [] - if isWindowsPlatform(): - # search the interpreters on Windows platforms - for path in winPathList: - exeList = [ - "python.exe", - "python{0}.{1}.exe".format(path[-2], path[-1]), - ] - for exe in exeList: - interpreter = os.path.join(path, exe) - if os.path.isfile(interpreter): - interpreters.append(interpreter) - else: - # search interpreters on Posix and Mac platforms - for path in posixPathList: - for version in posixVersionsList: - interpreter = os.path.join(path, "python{0}".format(version)) - if os.path.isfile(interpreter): - interpreters.append(interpreter) - - return interpreters - - -############################################################################### ## functions for version handling ###############################################################################