From 0c170c3ab3c9b497af33d64710ec647f7cfc6684 Mon Sep 17 00:00:00 2001
From: Reno Dakota <paparodeo@proton.me>
Date: Fri, 6 Dec 2024 19:40:15 +0000
Subject: [PATCH] python312Packages.argcomplete: 3.5.1 -> 3.5.2

https://github.com/kislyuk/argcomplete/releases/tag/v3.5.2
---
 .../python-modules/argcomplete/default.nix    | 11 +----
 .../argcomplete/python-3.13-compat.patch      | 49 -------------------
 2 files changed, 2 insertions(+), 58 deletions(-)
 delete mode 100644 pkgs/development/python-modules/argcomplete/python-3.13-compat.patch

diff --git a/pkgs/development/python-modules/argcomplete/default.nix b/pkgs/development/python-modules/argcomplete/default.nix
index bac7379338c9..f4259f3d4151 100644
--- a/pkgs/development/python-modules/argcomplete/default.nix
+++ b/pkgs/development/python-modules/argcomplete/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "argcomplete";
-  version = "3.5.1";
+  version = "3.5.2";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,16 +18,9 @@ buildPythonPackage rec {
     owner = "kislyuk";
     repo = "argcomplete";
     rev = "refs/tags/v${version}";
-    hash = "sha256-um8iFzEHExTRV1BAl86/XKLc7vmf2Ws1dB83agfvoec=";
+    hash = "sha256-Tihb61LGTZ8tKrKKlxZ8scII2+pgzDHUkwVn54zlrug=";
   };
 
-  patches = [
-    # fixes issues with python3Packages.traitlets tests
-    # https://git.launchpad.net/ubuntu/+source/python-argcomplete/tree/debian/patches/python-3.13-compat.patch?h=ubuntu/plucky
-    # https://github.com/kislyuk/argcomplete/pull/513
-    ./python-3.13-compat.patch
-  ];
-
   build-system = [
     setuptools
     setuptools-scm
diff --git a/pkgs/development/python-modules/argcomplete/python-3.13-compat.patch b/pkgs/development/python-modules/argcomplete/python-3.13-compat.patch
deleted file mode 100644
index 8a1aa8354135..000000000000
--- a/pkgs/development/python-modules/argcomplete/python-3.13-compat.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 7438d1fa962eb736af9754669f200f29c5b6025d Mon Sep 17 00:00:00 2001
-From: liushuyu <liushuyu011@gmail.com>
-Date: Mon, 18 Nov 2024 16:12:54 -0700
-Subject: [PATCH] Preliminary Python 3.13 compatibility
-
----
- argcomplete/packages/_argparse.py | 15 +++++++++++++++
- 1 file changed, 15 insertions(+)
-
-diff --git a/argcomplete/packages/_argparse.py b/argcomplete/packages/_argparse.py
-index d10cf01..10ed00c 100644
---- a/argcomplete/packages/_argparse.py
-+++ b/argcomplete/packages/_argparse.py
-@@ -5,6 +5,7 @@
- 
- # This file contains argparse introspection utilities used in the course of argcomplete execution.
- 
-+import sys
- from argparse import (
-     ONE_OR_MORE,
-     OPTIONAL,
-@@ -15,6 +16,7 @@
-     Action,
-     ArgumentError,
-     ArgumentParser,
-+    Namespace,
-     _get_action_name,
-     _SubParsersAction,
- )
-@@ -75,6 +77,19 @@ class IntrospectiveArgumentParser(ArgumentParser):
-     except for the lines that contain the string "Added by argcomplete".
-     '''
- 
-+    def _parse_known_args2(self, args, namespace, intermixed):
-+        if args is None:
-+            # args default to the system args
-+            args = sys.argv[1:]
-+        else:
-+            # make sure that args are mutable
-+            args = list(args)
-+
-+        # default Namespace built from parser defaults
-+        if namespace is None:
-+            namespace = Namespace()
-+        return self._parse_known_args(args, namespace)
-+
-     def _parse_known_args(self, arg_strings, namespace):
-         _num_consumed_args.clear()  # Added by argcomplete
-         self._argcomplete_namespace = namespace