From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Tue, 16 Feb 2010 23:31:04 +0000 (+0000)
Subject: Merged revisions 78207 via svnmerge from
X-Git-Tag: v3.2a1~1688
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=412c95a4858e3020779baf0906b8c90eaa21108c;p=python

Merged revisions 78207 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r78207 | ezio.melotti | 2010-02-17 01:26:09 +0200 (Wed, 17 Feb 2010) | 1 line

  #7930: fix stripid
........
---

diff --git a/Lib/pydoc.py b/Lib/pydoc.py
index 28d3bb8c5f..79fb54a51d 100755
--- a/Lib/pydoc.py
+++ b/Lib/pydoc.py
@@ -123,9 +123,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 3bcd592bac..5d99e43203 100644
--- a/Lib/test/test_pydoc.py
+++ b/Lib/test/test_pydoc.py
@@ -306,6 +306,19 @@ class PyDocDocTest(unittest.TestCase):
         expected = missing_pattern % missing_module.strip()
         self.assertEqual(expected, result)
 
+    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):