diff -r 2648f2c894df -r b1ade4fcf05f eric6/Preferences/__init__.py
--- a/eric6/Preferences/__init__.py Wed Sep 30 19:33:21 2020 +0200
+++ b/eric6/Preferences/__init__.py Wed Sep 30 19:34:11 2020 +0200
@@ -1431,7 +1431,9 @@
# defaults for pip
pipDefaults = {
- "PipSearchIndex": "", # used by the search command
+ "PipSearchIndex": "", # used by the search command
+ "ExcludeCondaEnvironments": True,
+ # don't show conda environments in selector
}
# defaults for MicroPython
@@ -3527,9 +3529,14 @@
@param prefClass preferences class used as the storage area
@return the requested pip value
"""
- return prefClass.settings.value(
- "Pip/" + key,
- prefClass.pipDefaults[key])
+ if key in ("ExcludeCondaEnvironments"):
+ return toBool(prefClass.settings.value(
+ "Pip/" + key,
+ prefClass.pipDefaults[key]))
+ else:
+ return prefClass.settings.value(
+ "Pip/" + key,
+ prefClass.pipDefaults[key])
def setPip(key, value, prefClass=Prefs):
