commit 5e76e94fd45711d65b2f0958b090913e3eff5f49
author Nick Coghlan <ncoghlan@gmail.com> Sat Jun 12 13:42:46 2010 +0000
committer Nick Coghlan <ncoghlan@gmail.com> Sat Jun 12 13:42:46 2010 +0000
tree bd166764c61b9317eb1c5b311e4c9502cad0f95d
parent 0681785d09adb4de0cfd5cdeb2c70d6eeb690dde

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

........
  r80578 | nick.coghlan | 2010-04-29 00:29:06 +1000 (Thu, 29 Apr 2010) | 1 line

  Issue 7490: make IGNORE_EXCEPTION_DETAIL also ignore details of the module containing the exception under test (original patch by Lennart Regebro)
........

Lib/doctest.py

diff --git a/Lib/doctest.py b/Lib/doctest.py
index 3b32004..5111a73 100644
--- a/Lib/doctest.py
+++ b/Lib/doctest.py
@@ -1277,9 +1277,9 @@
 
                 # Another chance if they didn't care about the detail.
                 elif self.optionflags & IGNORE_EXCEPTION_DETAIL:
-                    m1 = re.match(r'[^:]*:', example.exc_msg)
-                    m2 = re.match(r'[^:]*:', exc_msg)
-                    if m1 and m2 and check(m1.group(0), m2.group(0),
+                    m1 = re.match(r'(?:[^:]*\.)?([^:]*:)', example.exc_msg)
+                    m2 = re.match(r'(?:[^:]*\.)?([^:]*:)', exc_msg)
+                    if m1 and m2 and check(m1.group(1), m2.group(1),
                                            self.optionflags):
                         outcome = SUCCESS