Fix cross-major creation on Windows of activate_this.py throws… (#1730)

Signed-off-by: Bernat Gabor <bgabor8@bloomberg.net>
pypa · Mar 18, 2020 · 893050e · 893050e
1 parent 59ea2ef
commit 893050e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/docs/changelog/1710.bugfix.rst b/docs/changelog/1710.bugfix.rst
@@ -0,0 +1,2 @@
+Fix ``activate_this.py`` throws ``AttributeError`` on Windows when virtual environment was created via cross python
+mechanism - by :user:`gaborbernat`.
diff --git a/src/virtualenv/activation/python/__init__.py b/src/virtualenv/activation/python/__init__.py
@@ -3,7 +3,6 @@
 import os
 from collections import OrderedDict
 
-from virtualenv.info import WIN_CPYTHON_2
 from virtualenv.util.path import Path
 from virtualenv.util.six import ensure_text
 
@@ -17,10 +16,11 @@ def templates(self):
     def replacements(self, creator, dest_folder):
         replacements = super(PythonActivator, self).replacements(creator, dest_folder)
         lib_folders = OrderedDict((os.path.relpath(str(i), str(dest_folder)), None) for i in creator.libs)
+        win_py2 = creator.interpreter.platform == "win32" and creator.interpreter.version_info.major == 2
         replacements.update(
             {
                 "__LIB_FOLDERS__": ensure_text(os.pathsep.join(lib_folders.keys())),
-                "__DECODE_PATH__": ("yes" if WIN_CPYTHON_2 else ""),
+                "__DECODE_PATH__": ("yes" if win_py2 else ""),
             }
         )
         return replacements