https://github.com/python/cpython/commit/786cac0c64dc156dfee817e87f15ae56b7e3ed00 commit: 786cac0c64dc156dfee817e87f15ae56b7e3ed00 branch: main author: Kirill Podoprigora <[email protected]> committer: sobolevn <[email protected]> date: 2024-08-16T07:14:53Z summary:
gh-123046: Fix regexp to catch cases where the module name is omitted from the weakref repr (#123047) Co-authored-by: sobolevn <[email protected]> files: M Lib/test/test_weakref.py diff --git a/Lib/test/test_weakref.py b/Lib/test/test_weakref.py index 2b9b2a04db8298..023df68fca7356 100644 --- a/Lib/test/test_weakref.py +++ b/Lib/test/test_weakref.py @@ -123,10 +123,12 @@ 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]+>") + 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 @@ 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\)>") + 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 @@ 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]+>") + 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() _______________________________________________ Python-checkins mailing list -- [email protected] To unsubscribe send an email to [email protected] https://mail.python.org/mailman3/lists/python-checkins.python.org/ Member address: [email protected]
