SF patch [#466616] Exclude imported items from doctest,

from Tim Hochberg.  Also mucho fiddling to change the way doctest
determines whether a thing is a function, module or class.  Under 2.2,
this really requires the functions in inspect.py (e.g., types.ClassType
is close to meaningless now, if not outright misleading).

1 files changed, 3 insertions, 2 deletions

diff --git a/Lib/test/test_pyclbr.py b/Lib/test/test_pyclbr.py
index 179b3b5..fdb3ddf 100644
--- a/Lib/test/test_pyclbr.py
+++ b/Lib/test/test_pyclbr.py
@@ -32,7 +32,7 @@ class PyclbrTest(unittest.TestCase):
     def assertHasattr(self, obj, attr, ignore):
         ''' succeed iff hasattr(obj,attr) or attr in ignore. '''
         if attr in ignore: return
-        if not hasattr(obj, attr): print "???",attr
+        if not hasattr(obj, attr): print "???", attr
         self.failUnless(hasattr(obj, attr))
 
 
@@ -100,7 +100,8 @@ class PyclbrTest(unittest.TestCase):
 
     def test_easy(self):
         self.checkModule('pyclbr')
-        self.checkModule('doctest')
+        self.checkModule('doctest',
+                         ignore=['_isclass', '_isfunction', '_ismodule'])
         self.checkModule('rfc822')
         self.checkModule('xmllib')
         self.checkModule('difflib')