Make test_inspect pass once again.

floum · May 21, 2007 · 813b0e5 · 813b0e5
1 parent 2a857de
commit 813b0e5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/Lib/inspect.py b/Lib/inspect.py
@@ -313,7 +313,7 @@ def getdoc(object):
         doc = object.__doc__
     except AttributeError:
         return None
-    if not isinstance(doc, types.StringTypes):
+    if not isinstance(doc, basestring):
         return None
     try:
         lines = doc.expandtabs().split('\n')

diff --git a/Lib/test/test_inspect.py b/Lib/test/test_inspect.py
@@ -3,6 +3,7 @@
 import unittest
 import inspect
 import datetime
+import collections
 
 from test.test_support import TESTFN, run_unittest
 
@@ -60,7 +61,7 @@ def test_excluding_predicates(self):
         self.istest(inspect.ismethod, 'git.argue')
         self.istest(inspect.ismodule, 'mod')
         self.istest(inspect.istraceback, 'tb')
-        self.istest(inspect.isdatadescriptor, '__builtin__.file.closed')
+        self.istest(inspect.isdatadescriptor, 'collections.defaultdict.default_factory')
         if hasattr(types, 'GetSetDescriptorType'):
             self.istest(inspect.isgetsetdescriptor,
                         'type(tb.tb_frame).f_locals')