Make test_inspect pass once again.
diff --git a/Lib/inspect.py b/Lib/inspect.py
index d2546f1..372013b 100644
--- a/Lib/inspect.py
+++ b/Lib/inspect.py
@@ -313,7 +313,7 @@
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 7919931..46e008a 100644
--- 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 @@
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')