From 0deaca4862bab2bf0b5a339d8e4dbe1bfb962b64 Mon Sep 17 00:00:00 2001
From: Avasam <samuel.06@hotmail.com>
Date: Mon, 22 Apr 2024 09:03:38 -0400
Subject: [PATCH] Bump boltons to 24.0.* (#11804)

---
 stubs/boltons/@tests/stubtest_allowlist.txt | 16 ----------------
 stubs/boltons/METADATA.toml                 |  2 +-
 stubs/boltons/boltons/ecoutils.pyi          |  1 -
 stubs/boltons/boltons/funcutils.pyi         | 15 +++++++++++++++
 stubs/boltons/boltons/ioutils.pyi           |  2 --
 stubs/boltons/boltons/strutils.pyi          | 10 ++++------
 stubs/boltons/boltons/urlutils.pyi          |  2 ++
 7 files changed, 22 insertions(+), 26 deletions(-)

diff --git a/stubs/boltons/@tests/stubtest_allowlist.txt b/stubs/boltons/@tests/stubtest_allowlist.txt
index 97a6c0f559ab..ff9bc2c06069 100644
--- a/stubs/boltons/@tests/stubtest_allowlist.txt
+++ b/stubs/boltons/@tests/stubtest_allowlist.txt
@@ -1,22 +1,6 @@
-# These names exist in __all__, but have no definition:
-boltons.strutils.int_list_complement
-boltons.strutils.int_list_to_int_tuples
-
 # Internal compatibility aliases
-boltons.cacheutils.basestring
-boltons.funcutils.basestring
 boltons.funcutils.make_method
-boltons.iterutils.basestring
-
-boltons.cacheutils.bytes
-boltons.cacheutils.str
-boltons.cacheutils.unicode
-boltons.cacheutils.xrange
 boltons.deprutils.ModuleType.__dict__
 boltons.deprutils.ModuleType.__getattr__
-boltons.iterutils.unicode
-boltons.iterutils.xrange
 boltons.mathutils.unicode
-boltons.urlutils.OMD
-boltons.urlutils.unichr
 boltons.urlutils.unicode
diff --git a/stubs/boltons/METADATA.toml b/stubs/boltons/METADATA.toml
index a6a82229be78..fd63abc572a5 100644
--- a/stubs/boltons/METADATA.toml
+++ b/stubs/boltons/METADATA.toml
@@ -1,2 +1,2 @@
-version = "23.1.*"
+version = "24.0.*"
 upstream_repository = "https://github.com/mahmoud/boltons"
diff --git a/stubs/boltons/boltons/ecoutils.pyi b/stubs/boltons/boltons/ecoutils.pyi
index fd65b87cc2c3..c02820701d97 100644
--- a/stubs/boltons/boltons/ecoutils.pyi
+++ b/stubs/boltons/boltons/ecoutils.pyi
@@ -1,7 +1,6 @@
 from typing import Any
 
 ECO_VERSION: str
-PY_GT_2: bool
 HAVE_URANDOM: bool
 INSTANCE_ID: str
 IS_64BIT: bool
diff --git a/stubs/boltons/boltons/funcutils.pyi b/stubs/boltons/boltons/funcutils.pyi
index f5fc35fa1947..b44cccf3b94b 100644
--- a/stubs/boltons/boltons/funcutils.pyi
+++ b/stubs/boltons/boltons/funcutils.pyi
@@ -4,6 +4,21 @@ from functools import total_ordering as total_ordering
 
 NO_DEFAULT: Incomplete
 
+def inspect_formatargspec(
+    args,
+    varargs=None,
+    varkw=None,
+    defaults=None,
+    kwonlyargs=(),
+    kwonlydefaults={},
+    annotations={},
+    formatarg=...,
+    formatvarargs=...,
+    formatvarkw=...,
+    formatvalue=...,
+    formatreturns=...,
+    formatannotation=...,
+): ...
 def get_module_callables(mod, ignore: Incomplete | None = None): ...
 def mro_items(type_obj): ...
 def dir_dict(obj, raise_exc: bool = False): ...
diff --git a/stubs/boltons/boltons/ioutils.pyi b/stubs/boltons/boltons/ioutils.pyi
index 708b19c79b02..a7e325a1aa23 100644
--- a/stubs/boltons/boltons/ioutils.pyi
+++ b/stubs/boltons/boltons/ioutils.pyi
@@ -2,8 +2,6 @@ import abc
 from _typeshed import Incomplete
 from abc import abstractmethod
 
-text_type = str
-binary_type = bytes
 READ_CHUNK_SIZE: int
 EINVAL: Incomplete
 
diff --git a/stubs/boltons/boltons/strutils.pyi b/stubs/boltons/boltons/strutils.pyi
index 9519a95e4eaa..9243a4b78c4a 100644
--- a/stubs/boltons/boltons/strutils.pyi
+++ b/stubs/boltons/boltons/strutils.pyi
@@ -5,8 +5,6 @@ from typing import Any, TypeVar
 _KT = TypeVar("_KT")
 _VT = TypeVar("_VT")
 
-unichr = chr
-
 def camel2under(camel_string: str) -> str: ...
 def under2camel(under_string: str) -> str: ...
 def slugify(text: str, delim: str = "_", lower: bool = True, ascii: bool = False) -> str: ...
@@ -49,6 +47,10 @@ def args2sh(args: list[str], sep: str = " ") -> str: ...
 def args2cmd(args: list[str], sep: str = " ") -> str: ...
 def parse_int_list(range_string: str, delim: str = ",", range_delim: str = "-") -> list[int]: ...
 def format_int_list(int_list: list[int], delim: str = ",", range_delim: str = "-", delim_space: bool = False) -> str: ...
+def complement_int_list(
+    range_string: str, range_start: int = 0, range_end: int | None = None, delim: str = ",", range_delim: str = "-"
+) -> str: ...
+def int_ranges_from_int_list(range_string: str, delim: str = ",", range_delim: str = "-") -> tuple[int, int]: ...
 
 class MultiReplace:
     group_map: dict[str, str]
@@ -58,7 +60,3 @@ class MultiReplace:
 
 def multi_replace(text: str, sub_map: dict[str, str], **kwargs) -> str: ...
 def unwrap_text(text: str, ending: str = "\n\n") -> str: ...
-
-# Names in __all__ with no definition:
-#   int_list_complement
-#   int_list_to_int_tuples
diff --git a/stubs/boltons/boltons/urlutils.pyi b/stubs/boltons/boltons/urlutils.pyi
index 93cba19ed8b4..fb4645226dcf 100644
--- a/stubs/boltons/boltons/urlutils.pyi
+++ b/stubs/boltons/boltons/urlutils.pyi
@@ -80,6 +80,8 @@ VALUE: Incomplete
 SPREV: Incomplete
 SNEXT: Incomplete
 
+OMD = OrderedMultiDict
+
 class QueryParamDict(OrderedMultiDict[Incomplete, Incomplete]):
     @classmethod
     def from_text(cls, query_string): ...