From ea84f684a6d73e6a21bf3d7ad5fb6e794ac686ee Mon Sep 17 00:00:00 2001 From: Oz N Tiram Date: Thu, 6 Oct 2022 00:23:47 +0200 Subject: [PATCH 1/2] Remove unused import of threading --- tests/integration/conftest.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py index d99afad8..6af42615 100644 --- a/tests/integration/conftest.py +++ b/tests/integration/conftest.py @@ -6,7 +6,6 @@ import os import shlex import shutil import traceback -import threading import sys import warnings from pathlib import Path From 1f836f66fced4ca2c4e3f1dd75b0f1c0aedb4385 Mon Sep 17 00:00:00 2001 From: Oz N Tiram Date: Thu, 6 Oct 2022 00:24:08 +0200 Subject: [PATCH 2/2] Remove usage of fs_encode See also #5062 --- tests/integration/conftest.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py index 6af42615..0f2869cd 100644 --- a/tests/integration/conftest.py +++ b/tests/integration/conftest.py @@ -23,7 +23,6 @@ from pipenv.cli import cli from pipenv.exceptions import VirtualenvActivationException from pipenv.utils.processes import subprocess_run from pipenv.vendor import toml, tomlkit -from pipenv.vendor.vistir.compat import fs_encode from pipenv.vendor.vistir.contextmanagers import temp_environ from pipenv.vendor.vistir.misc import run from pipenv.vendor.vistir.path import ( @@ -412,12 +411,11 @@ class _PipenvInstance: def _rmtree_func(path, ignore_errors=True, onerror=None): - directory = fs_encode(path) shutil_rmtree = _rmtree if onerror is None: onerror = handle_remove_readonly try: - shutil_rmtree(directory, ignore_errors=ignore_errors, onerror=onerror) + shutil_rmtree(path, ignore_errors=ignore_errors, onerror=onerror) except (OSError, FileNotFoundError, PermissionError) as exc: # Ignore removal failures where the file doesn't exist if exc.errno != errno.ENOENT: