X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.vim%2Fpython%2Fvirtualenv.py;h=ed46739fb6774130b760abc3caef0a0017d711a5;hb=87e894e8ca4d76a9fb2746e68896be59395e78bb;hp=9341bc79f9663e407650941be798519bd73e4351;hpb=4012586325e2641a1ea2a960bdeebb7422f3cc9e;p=dotfiles.git

diff --git a/.vim/python/virtualenv.py b/.vim/python/virtualenv.py
index 9341bc7..ed46739 100644
--- a/.vim/python/virtualenv.py
+++ b/.vim/python/virtualenv.py
@@ -1,16 +1,25 @@
-import sys, os
+import sys, os  # noqa: E401 multiple imports on one line
 
 virtualenv_dir = os.environ.get('VIRTUAL_ENV')
 if virtualenv_dir:
-    sys.path.insert(0, virtualenv_dir)
-    for activate_this in [
-        os.path.join(virtualenv_dir, 'bin', 'activate_this.py'),
-        os.path.join(virtualenv_dir, 'Scripts', 'activate_this.py')
-    ]:
-        if not os.path.exists(activate_this):
-            continue
-        if sys.version_info[0] == 2:
-            execfile(activate_this, dict(__file__=activate_this))
-        else:
-            exec(open(activate_this, 'r').read(), dict(__file__=activate_this))
-        break
+    if (
+        (sys.version_info[0] == 2)
+            and os.path.exists(
+                os.path.join(virtualenv_dir, 'lib', 'python2.7'))
+    ) or (
+        not os.path.exists(
+                os.path.join(virtualenv_dir, 'lib', 'python2.7'))
+    ):
+        for activate_this in [
+            os.path.join(virtualenv_dir, 'bin', 'activate_this.py'),
+            os.path.join(virtualenv_dir, 'Scripts', 'activate_this.py')
+        ]:
+            if not os.path.exists(activate_this):
+                continue
+            if sys.version_info[0] == 2:
+                execfile(activate_this,  # noqa: F821 undefined name 'execfile'
+                         dict(__file__=activate_this))
+            else:
+                exec(open(activate_this, 'r').read(),
+                     dict(__file__=activate_this))
+            break