kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Utils: Don't save location of Python executable

Browse Source
This commit is contained in:
Chris Hennes
2025-11-30 20:36:44 -06:00
committed by Yorik van Havre
parent 0dcd2507bd
commit 98734790de
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Ext/freecad/utils.py
View File

@@ -32,15 +32,15 @@ import FreeCAD
def get_python_exe() -> str:
"""Find Python. In preference order
A) The value of the BaseApp/Preferences/PythonConsole/ExternalPythonExecutable user preference
A) The value of the BaseApp/Preferences/PythonConsole/PathToPythonExecutable user preference
B) The executable located in the same bin directory as FreeCAD and called "python3"
C) The executable located in the same bin directory as FreeCAD and called "python"
D) The result of a shutil search for your system's "python3" executable
E) The result of a shutil search for your system's "python" executable"""
prefs = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/PythonConsole")
python_exe = prefs.GetString("ExternalPythonExecutable", "Not set")
python_exe = prefs.GetString("PathToPythonExecutable", "")
fc_dir = FreeCAD.getHomePath()
if not python_exe or python_exe == "Not set" or not os.path.exists(python_exe):
if not python_exe or not os.path.exists(python_exe):
python_exe = os.path.join(fc_dir, "bin", "python3")
if "Windows" in platform.system():
python_exe += ".exe"
@@ -60,5 +60,4 @@ def get_python_exe() -> str:
return ""
python_exe = python_exe.replace("/", os.path.sep)
prefs.SetString("ExternalPythonExecutable", python_exe)
return python_exe

4
src/Gui/PreferencePages/DlgSettingsPythonConsole.cpp
View File

@@ -44,7 +44,7 @@ void DlgSettingsPythonConsole::saveSettings()
ui->PythonBlockCursor->onSave();
ui->PythonSaveHistory->onSave();
ui->ProfilerInterval->onSave();
ui->ExternalPythonExecutable->onSave();
ui->PathToPythonExecutable->onSave();
}
void DlgSettingsPythonConsole::loadSettings()
@@ -53,7 +53,7 @@ void DlgSettingsPythonConsole::loadSettings()
ui->PythonBlockCursor->onRestore();
ui->PythonSaveHistory->onRestore();
ui->ProfilerInterval->onRestore();
ui->ExternalPythonExecutable->onRestore();
ui->PathToPythonExecutable->onRestore();
}
void DlgSettingsPythonConsole::changeEvent(QEvent* event)

4
src/Gui/PreferencePages/DlgSettingsPythonConsole.ui
View File

@@ -127,7 +127,7 @@ horizontal space in Python console</string>
</widget>
</item>
<item row="0" column="1">
<widget class="Gui::PrefFileChooser" name="ExternalPythonExecutable" native="true">
<widget class="Gui::PrefFileChooser" name="PathToPythonExecutable" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
@@ -144,7 +144,7 @@ horizontal space in Python console</string>
<string>Used for package installation with pip and debugging with debugpy. Autodetected if needed and not specified.</string>
</property>
<property name="prefEntry" stdset="0">
<cstring>ExternalPythonExecutable</cstring>
<cstring>PathToPythonExecutable</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>PythonConsole</cstring>