Refactor(bin/decode-URLs.py): Python3-only

[dotfiles.git] / .vim / python / virtualenv.py

diff --git a/.vim/python/virtualenv.py b/.vim/python/virtualenv.py
index 078a0f8c54d226df0b28035a36a4bc140e38f930..62316009e94bfe707b5cdc5cf6b465283375ab03 100644 (file)
--- a/.vim/python/virtualenv.py
+++ b/.vim/python/virtualenv.py
@@ -1,10 +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)
-    activate_this = os.path.join(virtualenv_dir, 'bin', 'activate_this.py')
-    if sys.version_info[0] == 2:
-        execfile(activate_this, dict(__file__=activate_this))
-    else:
-        exec(open(activate_this, 'r').read(), dict(__file__=activate_this))
+    if (
+        os.path.exists(
+            os.path.join(
+                virtualenv_dir, 'lib',
+                'python%d.%d' % (sys.version_info[0], sys.version_info[1])
+            )
+        )
+    ):
+        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