From 2b3112ee99446ea2eed8363ab14357f1a6b9c346 Mon Sep 17 00:00:00 2001 From: Avasam Date: Mon, 21 Oct 2024 15:45:37 -0400 Subject: [PATCH] Fix type-errors post-merge --- setuptools/__init__.py | 2 +- setuptools/dist.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/setuptools/__init__.py b/setuptools/__init__.py index 5f4fe88445..eba86c4f9c 100644 --- a/setuptools/__init__.py +++ b/setuptools/__init__.py @@ -186,7 +186,7 @@ def _ensure_stringlike(self, option, what, default=None): ) return val - def ensure_string_list(self, option: str): # type: ignore[override] # Fixed in typeshed for mypy 1.12 + def ensure_string_list(self, option: str): r"""Ensure that 'option' is a list of strings. If 'option' is currently a string, we split it either on /,\s*/ or /\s+/, so "foo bar baz", "foo,bar,baz", and "foo, bar baz" all become diff --git a/setuptools/dist.py b/setuptools/dist.py index 6696c4ab6f..1348ca61c2 100644 --- a/setuptools/dist.py +++ b/setuptools/dist.py @@ -33,6 +33,7 @@ command as _, # noqa: F401 # imported for side-effects ) from ._importlib import metadata +from ._reqs import _StrOrIter from .config import pyprojecttoml, setupcfg from .discovery import ConfigDiscovery from .monkey import get_unpatched