diff options
| author | njsmith <njs@pobox.com> | 2013-03-01 09:16:58 -0800 |
|---|---|---|
| committer | njsmith <njs@pobox.com> | 2013-03-01 09:16:58 -0800 |
| commit | d111fbdc1e7da219e4a30b8abd3f710b57116635 (patch) | |
| tree | 3780cc9c487659538c51b7c8d8e091c52fd7047f /numpy/testing/noseclasses.py | |
| parent | 3c13c0a925276130d66be490eed4ae337712cce2 (diff) | |
| parent | 0a5746d3c22cf296b995476bdc473a4423d7a84d (diff) | |
| download | numpy-d111fbdc1e7da219e4a30b8abd3f710b57116635.tar.gz | |
Merge pull request #3099 from charris/2to3-methodattrs
2to3: Apply `methodattrs` fixes.
Diffstat (limited to 'numpy/testing/noseclasses.py')
| -rw-r--r-- | numpy/testing/noseclasses.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/numpy/testing/noseclasses.py b/numpy/testing/noseclasses.py index 77634deea..6df3d1cb0 100644 --- a/numpy/testing/noseclasses.py +++ b/numpy/testing/noseclasses.py @@ -48,7 +48,7 @@ class NumpyDocTestFinder(doctest.DocTestFinder): # to make by extension code writers, having this safety in place # isn't such a bad idea #print '_fm C3-1' # dbg - return module.__name__ == object.im_class.__module__ + return module.__name__ == object.__self__.__class__.__module__ elif inspect.getmodule(object) is not None: #print '_fm C4' # dbg #print 'C4 mod',module,'obj',object # dbg @@ -100,7 +100,7 @@ class NumpyDocTestFinder(doctest.DocTestFinder): if isinstance(val, staticmethod): val = getattr(obj, valname) if isinstance(val, classmethod): - val = getattr(obj, valname).im_func + val = getattr(obj, valname).__func__ # Recurse to methods, properties, and nested classes. if ((isfunction(val) or isclass(val) or |