pip: improved the determination of the default environment for editing the pip configuration file.

Mon, 02 Jul 2018 18:18:23 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Mon, 02 Jul 2018 18:18:23 +0200
changeset 6394
17ecf4a340e7
parent 6393
46e4ae753e22
child 6395
613e37fabd96
child 6396
f6d4ab496cfe

pip: improved the determination of the default environment for editing the pip configuration file.

Plugins/UiExtensionPlugins/PipInterface/Pip.py file | annotate | diff | comparison | revisions
--- a/Plugins/UiExtensionPlugins/PipInterface/Pip.py	Mon Jul 02 18:16:43 2018 +0200
+++ b/Plugins/UiExtensionPlugins/PipInterface/Pip.py	Mon Jul 02 18:18:23 2018 +0200
@@ -543,8 +543,14 @@
             venvDirectory = os.environ["VIRTUAL_ENV"]
         except KeyError:
             venvName = self.__plugin.getPreferences("CurrentEnvironment")
-            venvDirectory = self.__virtualenvManager.getVirtualenvDirectory(
-                venvName)
+            if not venvName:
+                self.__selectPipVirtualenv()
+                venvName = self.__plugin.getPreferences("CurrentEnvironment")
+            if self.__virtualenvManager.isGlobalEnvironment(venvName):
+                venvDirectory = self.__getUserConfig()
+            else:
+                venvDirectory = \
+                    self.__virtualenvManager.getVirtualenvDirectory(venvName)
         
         return os.path.join(venvDirectory, pip)
     

eric ide

mercurial