mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-31 05:58:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

bpo-36929: Modify io/re tests to allow for missing mod name (#13392)

Browse source 
* bpo-36929: Modify io/re tests to allow for missing mod name

For a vanishingly small number of internal types, CPython sets the
tp_name slot to mod_name.type_name, either in the PyTypeObject or the
PyType_Spec. There are a few minor places where this surfaces:

* Custom repr functions for those types (some of which ignore the
  tp_name in favor of using a string literal, such as _io.TextIOWrapper)
* Pickling error messages

The test suite only tests the former. This commit modifies the test
suite to allow Python implementations to omit the module prefix.

https://bugs.python.org/issue36929
This commit is contained in:
Max Bernstein 2019-05-21 10:09:21 -07:00 • committed by Dino Viehland
parent ad098b6750
commit ccb7ca728e
3 changed files with 34 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Lib/test/test_re.py
View file

@ -1761,24 +1761,28 @@ class ReTests(unittest.TestCase):
def test_match_repr(self):
for string in '[abracadabra]', S('[abracadabra]'):
m = re.search(r'(.+)(.*?)\1', string)
self.assertEqual(repr(m), "<%s.%s object; "
"span=(1, 12), match='abracadabra'>" %
(type(m).__module__, type(m).__qualname__))
pattern = r"<(%s\.)?%s object; span=\(1, 12\), match='abracadabra'>" % (
type(m).__module__, type(m).__qualname__
)
self.assertRegex(repr(m), pattern)
for string in (b'[abracadabra]', B(b'[abracadabra]'),
bytearray(b'[abracadabra]'),
memoryview(b'[abracadabra]')):
m = re.search(br'(.+)(.*?)\1', string)
self.assertEqual(repr(m), "<%s.%s object; "
"span=(1, 12), match=b'abracadabra'>" %
(type(m).__module__, type(m).__qualname__))
pattern = r"<(%s\.)?%s object; span=\(1, 12\), match=b'abracadabra'>" % (
type(m).__module__, type(m).__qualname__
)
self.assertRegex(repr(m), pattern)
first, second = list(re.finditer("(aa)|(bb)", "aa bb"))
self.assertEqual(repr(first), "<%s.%s object; "
"span=(0, 2), match='aa'>" %
(type(second).__module__, type(first).__qualname__))
self.assertEqual(repr(second), "<%s.%s object; "
"span=(3, 5), match='bb'>" %
(type(second).__module__, type(second).__qualname__))
pattern = r"<(%s\.)?%s object; span=\(0, 2\), match='aa'>" % (
type(second).__module__, type(second).__qualname__
)
self.assertRegex(repr(first), pattern)
pattern = r"<(%s\.)?%s object; span=\(3, 5\), match='bb'>" % (
type(second).__module__, type(second).__qualname__
)
self.assertRegex(repr(second), pattern)
def test_zerowidth(self):
# Issues 852532, 1647489, 3262, 25054.