diff options
| -rw-r--r-- | Lib/inspect.py | 2 | ||||
| -rw-r--r-- | Lib/test/test_inspect.py | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Lib/inspect.py b/Lib/inspect.py index d2546f15c1..372013bb82 100644 --- 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 7919931829..46e008af70 100644 --- 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') |