diff -r 8c3d033e5044 -r 0cdead130a81 eric6/VirtualEnv/VirtualenvAddEditDialog.py --- a/eric6/VirtualEnv/VirtualenvAddEditDialog.py Sat Jun 20 17:36:20 2020 +0200 +++ b/eric6/VirtualEnv/VirtualenvAddEditDialog.py Sun Jun 21 18:26:12 2020 +0200 @@ -26,8 +26,8 @@ Class implementing a dialog to enter the data of a virtual environment. """ def __init__(self, manager, venvName="", venvDirectory="", - venvInterpreter="", venvVariant=3, isGlobal=False, - isConda=False, isRemote=False, execPath="", parent=None): + venvInterpreter="", isGlobal=False, isConda=False, + isRemote=False, execPath="", parent=None): """ Constructor @@ -39,8 +39,6 @@ @type str @param venvInterpreter Python interpreter of the virtual environment @type str - @param venvVariant Python variant of the virtual environment - @type int @param isGlobal flag indicating a global environment @type bool @param isConda flag indicating an Anaconda virtual environment @@ -82,7 +80,6 @@ toNative=not isRemote) self.pythonExecPicker.setText(venvInterpreter, toNative=not isRemote) - self.variantComboBox.setCurrentIndex(3 - venvVariant) self.globalCheckBox.setChecked(isGlobal) self.anacondaCheckBox.setChecked(isConda) self.remoteCheckBox.setChecked(isRemote) @@ -211,19 +208,17 @@ Public method to retrieve the entered data. @return tuple containing the logical name, the directory, the - interpreter of the virtual environment, the Python variant, - a flag indicating a global environment, a flag indicating an - Anaconda environment, aflag indicating a remotely accessed - environment and a string to be prepended to the PATH environment - variable - @rtype tuple of (str, str, str, int, bool, bool, bool, str) + interpreter of the virtual environment, a flag indicating a + global environment, a flag indicating an Anaconda environment, + a flag indicating a remotely accessed environment and a string + to be prepended to the PATH environment variable + @rtype tuple of (str, str, str, bool, bool, bool, str) """ nativePaths = not self.remoteCheckBox.isChecked() return ( self.nameEdit.text(), self.targetDirectoryPicker.text(toNative=nativePaths), self.pythonExecPicker.text(toNative=nativePaths), - 3 - self.variantComboBox.currentIndex(), self.globalCheckBox.isChecked(), self.anacondaCheckBox.isChecked(), self.remoteCheckBox.isChecked(),