diff options
| -rwxr-xr-x | Lib/pydoc.py | 4 | ||||
| -rw-r--r-- | Lib/test/test_pydoc.py | 13 |
2 files changed, 14 insertions, 3 deletions
diff --git a/Lib/pydoc.py b/Lib/pydoc.py index 7da75b6..7a55023 100755 --- a/Lib/pydoc.py +++ b/Lib/pydoc.py @@ -124,9 +124,7 @@ _re_stripid = re.compile(r' at 0x[0-9a-f]{6,16}(>+)$', re.IGNORECASE) def stripid(text): """Remove the hexadecimal id from a Python object representation.""" # 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 text + return _re_stripid.sub(r'\1', text) def _is_some_method(obj): return inspect.ismethod(obj) or inspect.ismethoddescriptor(obj) diff --git a/Lib/test/test_pydoc.py b/Lib/test/test_pydoc.py index 89f1c22..5f2d3b3 100644 --- a/Lib/test/test_pydoc.py +++ b/Lib/test/test_pydoc.py @@ -291,6 +291,19 @@ class PyDocDocTest(unittest.TestCase): "white space was not stripped from module name " "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): |