From 14380668b5fa0bc5daf49f19efd45928865a7f3f Mon Sep 17 00:00:00 2001 From: Jon Dufresne Date: Sun, 27 Dec 2020 08:08:33 -0800 Subject: [PATCH] Drop csv23 in favor of stdlib csv Using csv23 has been unnecessary since dropping Python 2 support. It previously remained as a compatibility shim. --- news/43602ba6-8a59-425c-9a97-9c8e87e28ddb.trivial.rst | 0 tests/lib/wheel.py | 4 ++-- tools/requirements/tests.txt | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) create mode 100644 news/43602ba6-8a59-425c-9a97-9c8e87e28ddb.trivial.rst diff --git a/news/43602ba6-8a59-425c-9a97-9c8e87e28ddb.trivial.rst b/news/43602ba6-8a59-425c-9a97-9c8e87e28ddb.trivial.rst new file mode 100644 index 000000000..e69de29bb diff --git a/tests/lib/wheel.py b/tests/lib/wheel.py index f96f5d06e..a7403bd7f 100644 --- a/tests/lib/wheel.py +++ b/tests/lib/wheel.py @@ -1,5 +1,6 @@ """Helper for building wheels as would be in test cases. """ +import csv import itertools from base64 import urlsafe_b64encode from collections import namedtuple @@ -11,7 +12,6 @@ from hashlib import sha256 from io import BytesIO, StringIO from zipfile import ZipFile -import csv23 from pip._vendor.requests.structures import CaseInsensitiveDict from pip._vendor.six import ensure_binary, ensure_text @@ -241,7 +241,7 @@ def record_file_maker_wrapper( records = record_callback(records) with StringIO(newline="") as buf: - writer = csv23.writer(buf) + writer = csv.writer(buf) for record in records: writer.writerow(map(ensure_text, record)) contents = buf.getvalue().encode("utf-8") diff --git a/tools/requirements/tests.txt b/tools/requirements/tests.txt index ef87225d6..28022b367 100644 --- a/tools/requirements/tests.txt +++ b/tools/requirements/tests.txt @@ -1,6 +1,5 @@ --use-feature=2020-resolver cryptography==2.8 -csv23 enum34; python_version < '3.4' freezegun mock