From b4f25f41bd6244cf4dd43aa53a13284c8810a070 Mon Sep 17 00:00:00 2001
From: Kirill Podoprigora <kirill.bast9@mail.ru>
Date: Thu, 15 Aug 2024 21:50:00 +0300
Subject: [PATCH 1/5] Fix regexp

---
 Lib/test/test_weakref.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Lib/test/test_weakref.py b/Lib/test/test_weakref.py
index 2b9b2a04db8298..3bed4f8d8263c1 100644
--- a/Lib/test/test_weakref.py
+++ b/Lib/test/test_weakref.py
@@ -125,7 +125,7 @@ def test_ref_repr(self):
         ref = weakref.ref(obj)
         self.assertRegex(repr(ref),
                          rf"<weakref at 0x[0-9a-fA-F]+; "
-                         rf"to '{C.__module__}.{C.__qualname__}' "
+                         rf"to '({C.__module__}.)?{C.__qualname__}' "
                          rf"at 0x[0-9a-fA-F]+>")
 
         obj = None
@@ -143,7 +143,7 @@ def __name__(self):
         ref2 = weakref.ref(obj2)
         self.assertRegex(repr(ref2),
                          rf"<weakref at 0x[0-9a-fA-F]+; "
-                         rf"to '{WithName.__module__}.{WithName.__qualname__}' "
+                         rf"to '({WithName.__module__}.)?{WithName.__qualname__}' "
                          rf"at 0x[0-9a-fA-F]+ \(custom_name\)>")
 
     def test_repr_failure_gh99184(self):
@@ -231,7 +231,7 @@ def test_proxy_repr(self):
         ref = weakref.proxy(obj, self.callback)
         self.assertRegex(repr(ref),
                          rf"<weakproxy at 0x[0-9a-fA-F]+; "
-                         rf"to '{C.__module__}.{C.__qualname__}' "
+                         rf"to '({C.__module__}.)?{C.__qualname__}' "
                          rf"at 0x[0-9a-fA-F]+>")
 
         obj = None

From 8fe39fb1a6fbcaa2d79310302bf16e70d6ec9980 Mon Sep 17 00:00:00 2001
From: Kirill Podoprigora <kirill.bast9@mail.ru>
Date: Fri, 16 Aug 2024 09:19:26 +0300
Subject: [PATCH 2/5] Address Nikita's comment

---
 Lib/test/test_weakref.py | 51 ++++++++++++++++++++++++++++++----------
 1 file changed, 39 insertions(+), 12 deletions(-)

diff --git a/Lib/test/test_weakref.py b/Lib/test/test_weakref.py
index 3bed4f8d8263c1..172d07488e52ca 100644
--- a/Lib/test/test_weakref.py
+++ b/Lib/test/test_weakref.py
@@ -123,10 +123,19 @@ def test_basic_ref(self):
     def test_ref_repr(self):
         obj = C()
         ref = weakref.ref(obj)
-        self.assertRegex(repr(ref),
-                         rf"<weakref at 0x[0-9a-fA-F]+; "
-                         rf"to '({C.__module__}.)?{C.__qualname__}' "
-                         rf"at 0x[0-9a-fA-F]+>")
+        if __name__ == "__main__":
+            regex = (
+                rf"<weakref at 0x[0-9a-fA-F]+; "
+                rf"to '{C.__qualname__}' "
+                rf"at 0x[0-9a-fA-F]+>"
+            )
+        else:
+            regex = (
+                rf"<weakref at 0x[0-9a-fA-F]+; "
+                rf"to '{C.__module__}.{C.__qualname__}' "
+                rf"at 0x[0-9a-fA-F]+>"
+            )
+        self.assertRegex(repr(ref), regex)
 
         obj = None
         gc_collect()
@@ -141,10 +150,19 @@ def __name__(self):
 
         obj2 = WithName()
         ref2 = weakref.ref(obj2)
-        self.assertRegex(repr(ref2),
-                         rf"<weakref at 0x[0-9a-fA-F]+; "
-                         rf"to '({WithName.__module__}.)?{WithName.__qualname__}' "
-                         rf"at 0x[0-9a-fA-F]+ \(custom_name\)>")
+        if __name__ == "__main__":
+            regex = (
+                rf"<weakref at 0x[0-9a-fA-F]+; " 
+                rf"to '{WithName.__qualname__}' " 
+                rf"at 0x[0-9a-fA-F]+ \(custom_name\)>"
+            )
+        else:
+            regex = (
+                rf"<weakref at 0x[0-9a-fA-F]+; " 
+                rf"to '{WithName.__module__}.{WithName.__qualname__}' " 
+                rf"at 0x[0-9a-fA-F]+ \(custom_name\)>"
+            )
+        self.assertRegex(repr(ref2), regex)
 
     def test_repr_failure_gh99184(self):
         class MyConfig(dict):
@@ -229,10 +247,19 @@ def check(proxy):
     def test_proxy_repr(self):
         obj = C()
         ref = weakref.proxy(obj, self.callback)
-        self.assertRegex(repr(ref),
-                         rf"<weakproxy at 0x[0-9a-fA-F]+; "
-                         rf"to '({C.__module__}.)?{C.__qualname__}' "
-                         rf"at 0x[0-9a-fA-F]+>")
+        if __name__ == "__main__":
+            regex = (
+                rf"<weakproxy at 0x[0-9a-fA-F]+; "
+                rf"to '{C.__qualname__}' "
+                rf"at 0x[0-9a-fA-F]+>"
+            )
+        else:
+            regex = (
+                rf"<weakproxy at 0x[0-9a-fA-F]+; "
+                rf"to '{C.__module__}.{C.__qualname__}' "
+                rf"at 0x[0-9a-fA-F]+>"
+            )
+        self.assertRegex(repr(ref), regex)
 
         obj = None
         gc_collect()

From bbf61305a46fe8d201c0ce0be94f6a46d85dd044 Mon Sep 17 00:00:00 2001
From: Kirill Podoprigora <kirill.bast9@mail.ru>
Date: Fri, 16 Aug 2024 09:20:22 +0300
Subject: [PATCH 3/5] Remove trailing whitespaces

---
 Lib/test/test_weakref.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Lib/test/test_weakref.py b/Lib/test/test_weakref.py
index 172d07488e52ca..cfd86448f8ee47 100644
--- a/Lib/test/test_weakref.py
+++ b/Lib/test/test_weakref.py
@@ -152,14 +152,14 @@ def __name__(self):
         ref2 = weakref.ref(obj2)
         if __name__ == "__main__":
             regex = (
-                rf"<weakref at 0x[0-9a-fA-F]+; " 
-                rf"to '{WithName.__qualname__}' " 
+                rf"<weakref at 0x[0-9a-fA-F]+; "
+                rf"to '{WithName.__qualname__}' "
                 rf"at 0x[0-9a-fA-F]+ \(custom_name\)>"
             )
         else:
             regex = (
-                rf"<weakref at 0x[0-9a-fA-F]+; " 
-                rf"to '{WithName.__module__}.{WithName.__qualname__}' " 
+                rf"<weakref at 0x[0-9a-fA-F]+; "
+                rf"to '{WithName.__module__}.{WithName.__qualname__}' "
                 rf"at 0x[0-9a-fA-F]+ \(custom_name\)>"
             )
         self.assertRegex(repr(ref2), regex)

From d7518087d5b3a0bccc460abba94647e9b819f06d Mon Sep 17 00:00:00 2001
From: Kirill Podoprigora <kirill.bast9@mail.ru>
Date: Fri, 16 Aug 2024 09:39:53 +0300
Subject: [PATCH 4/5] Update Lib/test/test_weakref.py

Co-authored-by: sobolevn <mail@sobolevn.me>
---
 Lib/test/test_weakref.py | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/Lib/test/test_weakref.py b/Lib/test/test_weakref.py
index cfd86448f8ee47..ce0f347ef68a5a 100644
--- a/Lib/test/test_weakref.py
+++ b/Lib/test/test_weakref.py
@@ -123,18 +123,11 @@ def test_basic_ref(self):
     def test_ref_repr(self):
         obj = C()
         ref = weakref.ref(obj)
-        if __name__ == "__main__":
-            regex = (
-                rf"<weakref at 0x[0-9a-fA-F]+; "
-                rf"to '{C.__qualname__}' "
-                rf"at 0x[0-9a-fA-F]+>"
-            )
-        else:
-            regex = (
-                rf"<weakref at 0x[0-9a-fA-F]+; "
-                rf"to '{C.__module__}.{C.__qualname__}' "
-                rf"at 0x[0-9a-fA-F]+>"
-            )
+        regex = (
+            rf"<weakref at 0x[0-9a-fA-F]+; "
+            rf"to '{'' if __name__ == '__main__' else C.__module__ + '.'}{C.__qualname__}' "
+            rf"at 0x[0-9a-fA-F]+>"
+        )
         self.assertRegex(repr(ref), regex)
 
         obj = None

From 1a11e001ab69949d19c1faf1a49a26bd46a85331 Mon Sep 17 00:00:00 2001
From: Kirill Podoprigora <kirill.bast9@mail.ru>
Date: Fri, 16 Aug 2024 09:49:12 +0300
Subject: [PATCH 5/5] Use the same approach for other cases

---
 Lib/test/test_weakref.py | 35 +++++++++++------------------------
 1 file changed, 11 insertions(+), 24 deletions(-)

diff --git a/Lib/test/test_weakref.py b/Lib/test/test_weakref.py
index ce0f347ef68a5a..023df68fca7356 100644
--- a/Lib/test/test_weakref.py
+++ b/Lib/test/test_weakref.py
@@ -143,18 +143,12 @@ def __name__(self):
 
         obj2 = WithName()
         ref2 = weakref.ref(obj2)
-        if __name__ == "__main__":
-            regex = (
-                rf"<weakref at 0x[0-9a-fA-F]+; "
-                rf"to '{WithName.__qualname__}' "
-                rf"at 0x[0-9a-fA-F]+ \(custom_name\)>"
-            )
-        else:
-            regex = (
-                rf"<weakref at 0x[0-9a-fA-F]+; "
-                rf"to '{WithName.__module__}.{WithName.__qualname__}' "
-                rf"at 0x[0-9a-fA-F]+ \(custom_name\)>"
-            )
+        regex = (
+            rf"<weakref at 0x[0-9a-fA-F]+; "
+            rf"to '{'' if __name__ == '__main__' else WithName.__module__ + '.'}"
+            rf"{WithName.__qualname__}' "
+            rf"at 0x[0-9a-fA-F]+ +\(custom_name\)>"
+        )
         self.assertRegex(repr(ref2), regex)
 
     def test_repr_failure_gh99184(self):
@@ -240,18 +234,11 @@ def check(proxy):
     def test_proxy_repr(self):
         obj = C()
         ref = weakref.proxy(obj, self.callback)
-        if __name__ == "__main__":
-            regex = (
-                rf"<weakproxy at 0x[0-9a-fA-F]+; "
-                rf"to '{C.__qualname__}' "
-                rf"at 0x[0-9a-fA-F]+>"
-            )
-        else:
-            regex = (
-                rf"<weakproxy at 0x[0-9a-fA-F]+; "
-                rf"to '{C.__module__}.{C.__qualname__}' "
-                rf"at 0x[0-9a-fA-F]+>"
-            )
+        regex = (
+            rf"<weakproxy at 0x[0-9a-fA-F]+; "
+            rf"to '{'' if __name__ == '__main__' else C.__module__ + '.'}{C.__qualname__}' "
+            rf"at 0x[0-9a-fA-F]+>"
+        )
         self.assertRegex(repr(ref), regex)
 
         obj = None