mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-29 14:15:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

#7930: fix stripid

Browse source
This commit is contained in:
Ezio Melotti 2010-02-16 23:26:09 +00:00
parent 6dfe66298b
commit e511fc7979
2 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/pydoc.py
View file

@ -124,9 +124,7 @@ _re_stripid = re.compile(r' at 0x[0-9a-f]{6,16}(>+)$', re.IGNORECASE)
def stripid(text): def stripid(text):
"""Remove the hexadecimal id from a Python object representation.""" """Remove the hexadecimal id from a Python object representation."""
# The behaviour of %p is implementation-dependent in terms of case. # The behaviour of %p is implementation-dependent in terms of case.
if _re_stripid.search(repr(Exception)):
return _re_stripid.sub(r'\1', text) return _re_stripid.sub(r'\1', text)
return text
def _is_some_method(obj): def _is_some_method(obj):
return inspect.ismethod(obj) or inspect.ismethoddescriptor(obj) return inspect.ismethod(obj) or inspect.ismethoddescriptor(obj)

13
Lib/test/test_pydoc.py
View file

@ -291,6 +291,19 @@ class PyDocDocTest(unittest.TestCase):
"white space was not stripped from module name " "white space was not stripped from module name "
"or other error output mismatch") "or other error output mismatch")
def test_stripid(self):
# test with strings, other implementations might have different repr()
stripid = pydoc.stripid
# strip the id
self.assertEqual(stripid('<function stripid at 0x88dcee4>'),
'<function stripid>')
self.assertEqual(stripid('<function stripid at 0x01F65390>'),
'<function stripid>')
# nothing to strip, return the same text
self.assertEqual(stripid('42'), '42')
self.assertEqual(stripid("<type 'exceptions.Exception'>"),
"<type 'exceptions.Exception'>")
class TestDescriptions(unittest.TestCase): class TestDescriptions(unittest.TestCase):