eric: comparison VirtualEnv/VirtualenvManager.py

-:53f6bd7fb238
+:ec32d1d7f525
 # each environment entry is a dictionary:
 #   path:           the directory of the virtual environment
 #                   (empty for a global environment)
 #   interpreter:    the path of the Python interpreter
 #   variant:        Python variant (2 or 3)
+#   is_global:      a flag indicating a global environment
 #
 for venvName in environments:
 interpreter = environments[venvName]["interpreter"]
 if os.access(interpreter, os.X_OK):
-self.__virtualEnvironments[venvName] = environments[venvName]
+environment = environments[venvName]
+if "is_global" not in environment:
+environment["is_global"] = environment["path"] == ""
+self.__virtualEnvironments[venvName] = environment
 # check, if the interpreter used to run eric is in the environments
 defaultPy = sys.executable.replace("w.exe", ".exe")
 found = False
 for venvName in self.__virtualEnvironments:
 # add an environment entry for the default interpreter
 self.__virtualEnvironments["<default>"] = {
 "path": "",
 "interpreter": defaultPy,
 "variant": sys.version_info[0],
+"is_global": True,
 }
 self.__saveSettings()
 def __saveSettings(self):
 dia.show()
 dia.start(args)
 dia.exec_()
 def addVirtualEnv(self, venvName, venvDirectory, venvInterpreter="",
-venvVariant=3):
+venvVariant=3, isGlobal=False):
 """
 Public method to add a virtual environment.
 @param venvName logical name for the virtual environment
 @type str
 @type str
 @param venvInterpreter 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
 """
 if venvName in self.__virtualEnvironments:
 ok = E5MessageBox.yesNo(
 None,
 self.tr("Add Virtual Environment"),
 from .VirtualenvInterpreterSelectionDialog import \
 VirtualenvInterpreterSelectionDialog
 dlg = VirtualenvInterpreterSelectionDialog(venvName, venvDirectory)
 if dlg.exec_() == QDialog.Accepted:
 venvInterpreter, venvVariant = dlg.getData()
+isGlobal = True
 if venvInterpreter:
 self.__virtualEnvironments[venvName] = {
 "path": venvDirectory,
 "interpreter": venvInterpreter,
 "variant": venvVariant,
+"is_global": isGlobal,
 }
 self.__saveSettings()
 if self.__virtualenvManagerDialog:
 self.__virtualenvManagerDialog.refresh()
 def setVirtualEnv(self, venvName, venvDirectory, venvInterpreter,
-venvVariant):
+venvVariant, isGlobal):
 """
 Public method to change a virtual environment.
 @param venvName logical name of the virtual environment
 @type str
 @type str
 @param venvInterpreter 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
 """
 if venvName not in self.__virtualEnvironments:
 E5MessageBox.yesNo(
 None,
 self.tr("Change Virtual Environment"),
 self.__virtualEnvironments[venvName] = {
 "path": venvDirectory,
 "interpreter": venvInterpreter,
 "variant": venvVariant,
+"is_global": isGlobal,
 }
 self.__saveSettings()
 if self.__virtualenvManagerDialog:
 self.__virtualenvManagerDialog.refresh()
 def renameVirtualEnv(self, oldVenvName, venvName, venvDirectory,
-venvInterpreter, venvVariant):
+venvInterpreter, venvVariant, isGlobal):
 """
 Public method to substitute a virtual environment entry with a new
 name.
 @param oldVenvName old name of the virtual environment
 @type str
 @param venvInterpreter 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
 """
 if oldVenvName not in self.__virtualEnvironments:
 E5MessageBox.yesNo(
 None,
 self.tr("Rename Virtual Environment"),
 icon=E5MessageBox.Warning)
 return
 del self.__virtualEnvironments[oldVenvName]
 self.addVirtualEnv(venvName, venvDirectory, venvInterpreter,
-venvVariant)
+venvVariant, isGlobal)
 def deleteVirtualEnvs(self, venvNames):
 """
 Public method to delete virtual environments from the list and disk.
 """ environments?"""),
 venvMessages
 )
 if dlg.exec_() == QDialog.Accepted:
 for venvName in venvNames:
-if venvName in self.__virtualEnvironments and \
+if self.__isEnvironmentDeleteable(venvName):
-bool(self.__virtualEnvironments[venvName]["path"]):
 shutil.rmtree(
 self.__virtualEnvironments[venvName]["path"], True)
 del self.__virtualEnvironments[venvName]
 self.__saveSettings()
 if self.__virtualenvManagerDialog:
 self.__virtualenvManagerDialog.refresh()
+def __isEnvironmentDeleteable(self, venvName):
+"""
+Private method to check, if a virtual environment can be deleted from
+disk.
+@param venvName name of the virtual environment
+@type str
+@return flag indicating it can be deleted
+@rtype bool
+"""
+ok = False
+if venvName in self.__virtualEnvironments:
+ok = True
+ok &= bool(self.__virtualEnvironments[venvName]["path"])
+ok &= not self.__virtualEnvironments[venvName]["is_global"]
+ok &= os.access(self.__virtualEnvironments[venvName]["path"],
+os.W_OK)
+return ok
 def removeVirtualEnvs(self, venvNames):
 """
 Public method to delete virtual environment from the list.
 for venvName in self.__virtualEnvironments:
 if self.__virtualEnvironments[venvName]["variant"] == variant:
 environments.append(venvName)
 return environments
+def isGlobalEnvironment(self, venvName):
+"""
+Public method to test, if a given environment is a global one.
+@param venvName logical name of the virtual environment
+@type str
+@return flag indicating a global environment
+@rtype bool
+"""
+return self.__virtualEnvironments[venvName]["is_global"]

Mercurial Repositories > eric / file comparison

comparison: VirtualEnv/VirtualenvManager.py

VirtualEnv/VirtualenvManager.py