--- a/mercurial/bundlecaches.py	Tue Jul 23 19:14:16 2024 -0400
+++ b/mercurial/bundlecaches.py	Tue Jul 23 19:20:22 2024 -0400
@@ -4,6 +4,7 @@
 # GNU General Public License version 2 or any later version.
 
 import collections
+import typing
 
 from typing import (
     Dict,
@@ -15,6 +16,11 @@
 
 from .thirdparty import attr
 
+# Force pytype to use the non-vendored package
+if typing.TYPE_CHECKING:
+    # noinspection PyPackageRequirements
+    import attr
+
 from . import (
     error,
     requirements as requirementsmod,