From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Sun, 6 Apr 2025 17:00:54 +0000 (+0200)
Subject: [3.13] gh-132159: Do not shadow user arguments in generated `__new__` by `@warnings... 
X-Git-Tag: v3.13.3~28
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=83070aa1089e8e8eaa72092da68d2ecd96d23536;p=thirdparty%2FPython%2Fcpython.git

[3.13] gh-132159: Do not shadow user arguments in generated `__new__` by `@warnings.deprecated` (GH-132160) (#132163)

gh-132159: Do not shadow user arguments in generated `__new__` by `@warnings.deprecated` (GH-132160)
(cherry picked from commit 7bb1e1a23634bae81bf76fdb34e9f9f7e59b3793)

Co-authored-by: Xuehai Pan <XuehaiPan@pku.edu.cn>
---

diff --git a/Lib/test/test_warnings/__init__.py b/Lib/test/test_warnings/__init__.py
index 5ed71495d84a..e2dd90964707 100644
--- a/Lib/test/test_warnings/__init__.py
+++ b/Lib/test/test_warnings/__init__.py
@@ -1628,6 +1628,25 @@ class DeprecatedTests(unittest.TestCase):
         instance = Child(42)
         self.assertEqual(instance.a, 42)
 
+    def test_do_not_shadow_user_arguments(self):
+        new_called = False
+        new_called_cls = None
+
+        @deprecated("MyMeta will go away soon")
+        class MyMeta(type):
+            def __new__(mcs, name, bases, attrs, cls=None):
+                nonlocal new_called, new_called_cls
+                new_called = True
+                new_called_cls = cls
+                return super().__new__(mcs, name, bases, attrs)
+
+        with self.assertWarnsRegex(DeprecationWarning, "MyMeta will go away soon"):
+            class Foo(metaclass=MyMeta, cls='haha'):
+                pass
+
+        self.assertTrue(new_called)
+        self.assertEqual(new_called_cls, 'haha')
+
     def test_existing_init_subclass(self):
         @deprecated("C will go away soon")
         class C:
diff --git a/Lib/warnings.py b/Lib/warnings.py
index 8d340b5b5789..f83aaf231eaa 100644
--- a/Lib/warnings.py
+++ b/Lib/warnings.py
@@ -589,7 +589,7 @@ class deprecated:
             original_new = arg.__new__
 
             @functools.wraps(original_new)
-            def __new__(cls, *args, **kwargs):
+            def __new__(cls, /, *args, **kwargs):
                 if cls is arg:
                     warn(msg, category=category, stacklevel=stacklevel + 1)
                 if original_new is not object.__new__:
diff --git a/Misc/NEWS.d/next/Library/2025-04-06-16-12-49.gh-issue-132159.WvBfBm.rst b/Misc/NEWS.d/next/Library/2025-04-06-16-12-49.gh-issue-132159.WvBfBm.rst
new file mode 100644
index 000000000000..8cec76e9b474
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2025-04-06-16-12-49.gh-issue-132159.WvBfBm.rst
@@ -0,0 +1 @@
+Do not shadow user arguments in generated :meth:`!__new__` by decorator :class:`warnings.deprecated`. Patch by Xuehai Pan.