commit c4c84e1a1954a1f46e160d2bc53927347d9e3159
author R. David Murray <rdmurray@bitdance.com> Tue Jun 23 20:37:26 2009 +0000
committer R. David Murray <rdmurray@bitdance.com> Tue Jun 23 20:37:26 2009 +0000
tree 56d42796360d384bd679772f051cb97191320df5
parent 5f1446ac5b9d117ed77e4b12e99a007d276483a5

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

........
  r73529 | r.david.murray | 2009-06-23 14:02:46 -0400 (Tue, 23 Jun 2009) | 4 lines

  Fix issue 5230 by having pydoc's safeimport check to see if the import
  error was thrown from itself in order to decide if the module can't be
  found.  Thanks to Lucas Prado Melo for collaborating on the fix and tests.
........

Misc/ACKS

diff --git a/Misc/ACKS b/Misc/ACKS
index e0890e8..b35cc47 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -464,6 +464,7 @@
 Craig McPheeters
 Lambert Meertens
 Bill van Melle
+Lucas Prado Melo
 Luke Mewburn
 Mike Meyer
 Steven Miale