summaryrefslogtreecommitdiff
path: root/src/virtualenv/activation/python
diff options
context:
space:
mode:
authorBernát Gábor <gaborjbernat@gmail.com>2023-04-19 16:05:21 -0700
committerGitHub <noreply@github.com>2023-04-19 16:05:21 -0700
commit04af5026d8eff9ab34cd6f4a47e2f9de4f10a25c (patch)
tree7a7beb20e885285b6838f75db5c647a4d20317fc /src/virtualenv/activation/python
parentcdd7eb129e5a31b5ff6779f00bc7621908962626 (diff)
downloadvirtualenv-04af5026d8eff9ab34cd6f4a47e2f9de4f10a25c.tar.gz
Drop Python 2 support (#2548)
Diffstat (limited to 'src/virtualenv/activation/python')
-rw-r--r--src/virtualenv/activation/python/__init__.py14
-rw-r--r--src/virtualenv/activation/python/activate_this.py2
2 files changed, 5 insertions, 11 deletions
diff --git a/src/virtualenv/activation/python/__init__.py b/src/virtualenv/activation/python/__init__.py
index eb83504..28861f9 100644
--- a/src/virtualenv/activation/python/__init__.py
+++ b/src/virtualenv/activation/python/__init__.py
@@ -1,5 +1,6 @@
+from __future__ import annotations
+
import os
-import sys
from collections import OrderedDict
from ..via_template import ViaTemplateActivator
@@ -12,23 +13,14 @@ class PythonActivator(ViaTemplateActivator):
def replacements(self, creator, dest_folder):
replacements = super().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__": os.pathsep.join(lib_folders.keys()),
- "__DECODE_PATH__": ("yes" if win_py2 else ""),
+ "__DECODE_PATH__": "",
},
)
return replacements
- @staticmethod
- def _repr_unicode(creator, value):
- py2 = creator.interpreter.version_info.major == 2
- if py2: # on Python 2 we need to encode this into explicit utf-8, py3 supports unicode literals
- start = 2 if sys.version_info[0] == 3 else 1
- value = repr(value.encode("utf-8"))[start:-1]
- return value
-
__all__ = [
"PythonActivator",
diff --git a/src/virtualenv/activation/python/activate_this.py b/src/virtualenv/activation/python/activate_this.py
index e8eeb84..192c796 100644
--- a/src/virtualenv/activation/python/activate_this.py
+++ b/src/virtualenv/activation/python/activate_this.py
@@ -4,6 +4,8 @@ Use exec(open(this_file).read(), {'__file__': this_file}).
This can be used when you must use an existing Python interpreter, not the virtualenv bin/python.
"""
+from __future__ import annotations
+
import os
import site
import sys