diff --git a/sphinx/ext/autodoc.py b/sphinx/ext/autodoc.py index fe59e8b45ac..99540a838e8 100644 --- a/sphinx/ext/autodoc.py +++ b/sphinx/ext/autodoc.py @@ -810,7 +810,7 @@ def filter_members(self, members, want_all): # let extensions preprocess docstrings skip_user = self.env.app.emit_firstresult( 'autodoc-skip-member', self.objtype, membername, member, - not keep, self.options) + self.fullname, not keep, self.options) if skip_user is not None: keep = not skip_user diff --git a/sphinx/ext/napoleon/__init__.py b/sphinx/ext/napoleon/__init__.py index 59c1213c661..dd0779a20aa 100644 --- a/sphinx/ext/napoleon/__init__.py +++ b/sphinx/ext/napoleon/__init__.py @@ -307,7 +307,7 @@ def _process_docstring(app, what, name, obj, options, lines): lines[:] = result_lines[:] -def _skip_member(app, what, name, obj, skip, options): +def _skip_member(app, what, name, obj, namespace, skip, options): """Determine if private and special class members are included in docs. The following settings in conf.py determine if private and special class diff --git a/tests/test_autodoc.py b/tests/test_autodoc.py index 03e2063feaa..2debdaaf78b 100644 --- a/tests/test_autodoc.py +++ b/tests/test_autodoc.py @@ -93,7 +93,7 @@ def process_signature(app, what, name, obj, options, args, retann): return '42', None -def skip_member(app, what, name, obj, skip, options): +def skip_member(app, what, name, obj, namespace, skip, options): if name in ('__special1__', '__special2__'): return skip if name.startswith('_'): diff --git a/tests/test_ext_napoleon.py b/tests/test_ext_napoleon.py index 162f98e81fc..62f02589765 100644 --- a/tests/test_ext_napoleon.py +++ b/tests/test_ext_napoleon.py @@ -128,13 +128,13 @@ def assertSkip(self, what, member, obj, expect_skip, config_name): app.config = Config() setattr(app.config, config_name, True) if expect_skip: - self.assertEqual(skip, _skip_member(app, what, member, obj, skip, - mock.Mock())) + self.assertEqual(skip, _skip_member(app, what, member, obj, '', + skip, mock.Mock())) else: - self.assertFalse(_skip_member(app, what, member, obj, skip, + self.assertFalse(_skip_member(app, what, member, obj, '', skip, mock.Mock())) setattr(app.config, config_name, False) - self.assertEqual(skip, _skip_member(app, what, member, obj, skip, + self.assertEqual(skip, _skip_member(app, what, member, obj, '', skip, mock.Mock())) def test_namedtuple(self):