From e362bb01eae4ba0beeb2ffd5b43d9b8418255630 Mon Sep 17 00:00:00 2001 From: Oz Tiram Date: Sat, 4 Feb 2023 16:01:37 +0100 Subject: [PATCH] Remove usage of vistir.to_bytes Remove backward compatability code --- pipenv/__init__.py | 1 + pipenv/core.py | 6 +++--- pipenv/environment.py | 2 -- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pipenv/__init__.py b/pipenv/__init__.py index bbc7c83a..cd6ca2a9 100644 --- a/pipenv/__init__.py +++ b/pipenv/__init__.py @@ -43,6 +43,7 @@ if os.name == "nt": from pipenv.vendor import colorama # Backward compatability with vistir + # These variables will be removed in vistir 0.8.0 no_color = False for item in ("ANSI_COLORS_DISABLED", "VISTIR_DISABLE_COLORS"): if os.getenv(item): diff --git a/pipenv/core.py b/pipenv/core.py index d3b2882b..7d5d60c8 100644 --- a/pipenv/core.py +++ b/pipenv/core.py @@ -1468,7 +1468,7 @@ def write_requirement_to_file( click.echo( f"Writing supplied requirement line to temporary file: {line!r}", err=True ) - f.write(vistir.misc.to_bytes(line)) + f.write(line) r = f.name f.close() return r @@ -1661,8 +1661,8 @@ def pip_install_deps( err=True, ) target = editable_requirements if vcs_or_editable else standard_requirements - target.write(vistir.misc.to_bytes(line)) - target.write(vistir.misc.to_bytes("\n")) + target.write(line) + target.write("\n") standard_requirements.close() editable_requirements.close() diff --git a/pipenv/environment.py b/pipenv/environment.py index 5edfaad7..94193b28 100644 --- a/pipenv/environment.py +++ b/pipenv/environment.py @@ -1,5 +1,3 @@ -from __future__ import annotations - import contextlib import importlib import importlib.util