[3.13] gh-123046: Fix regexp to catch cases where the module name is omitted from the weakref repr (GH-123047) (#123058)

gh-123046: Fix regexp to catch cases where the module name is omitted from the weakref repr (GH-123047)
(cherry picked from commit 786cac0c64)

Co-authored-by: Kirill Podoprigora <kirill.bast9@mail.ru>
Co-authored-by: sobolevn <mail@sobolevn.me>
This commit is contained in:
Miss Islington (bot) 2024-08-16 09:41:49 +02:00 committed by GitHub
parent 5ac14eeea6
commit a604b2440f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -123,10 +123,12 @@ class ReferencesTestCase(TestBase):
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]+>")
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
gc_collect()
@ -141,10 +143,13 @@ class ReferencesTestCase(TestBase):
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\)>")
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):
class MyConfig(dict):
@ -229,10 +234,12 @@ class ReferencesTestCase(TestBase):
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]+>")
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
gc_collect()