Make test_inspect pass once again.

diff --git a/Lib/inspect.py b/Lib/inspect.py
index d2546f15c1ac37eb95f24efe95e79d8ef6929cd0..372013bb82bbe1d6b0f51ff5037bcd8aa5658efe 100644 (file)
--- 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
index 7919931829545ded9ba1119c1552221fe8465a71..46e008af708beddaca23c1ecb74fa0ad8324705f 100644 (file)
--- a/Lib/test/test_inspect.py
+++ b/Lib/test/test_inspect.py
@@ -3,6 +3,7 @@ import types
 import unittest
 import inspect
 import datetime
+import collections
 
 from test.test_support import TESTFN, run_unittest
 
@@ -60,7 +61,7 @@ class TestPredicates(IsTestBase):
         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')