Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix up Python2 regressions in PR 417 #452

Merged
merged 2 commits into from
Sep 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/object/function.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -586,6 +586,13 @@ BOOST_PYTHON_DECL void add_to_namespace(

BOOST_PYTHON_DECL object const& add_doc(object const& attribute, char const* doc)
{
#if PY_VERSION_HEX >= 0x03000000
if (PyInstanceMethod_Check(attribute.ptr())) {
#else
if (PyMethod_Check(attribute.ptr())) {
#endif
return attribute;
}
return function::add_doc(attribute, doc);
}

Expand Down
37 changes: 31 additions & 6 deletions test/nested.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@
>>> X.__name__
'X'

>>> X.Y
>>> X.Y # doctest: +py2
<class 'nested_ext.Y'>

>>> X.Y # doctest: +py3
<class 'nested_ext.X.Y'>

>>> X.Y.__module__
Expand All @@ -22,16 +25,22 @@
>>> X.Y.__name__
'Y'

>>> X.color.__qualname__
>>> getattr(X.color, "__qualname__", None) # doctest: +py3
'X.color'

>>> repr(X.color.red)
>>> repr(X.color.red) # doctest: +py2
'nested_ext.color.red'

>>> repr(X.color.red) # doctest: +py3
'nested_ext.X.color.red'

>>> repr(X.color(1))
>>> repr(X.color(1)) # doctest: +py2
'nested_ext.color(1)'

>>> repr(X.color(1)) # doctest: +py3
'nested_ext.X.color(1)'

>>> test_function.__doc__.strip().split('\\n')[0]
>>> test_function.__doc__.strip().split('\\n')[0] # doctest: +py3
'test_function( (X)arg1, (X.Y)arg2) -> None :'

'''
Expand All @@ -42,7 +51,23 @@ def run(args = None):

if args is not None:
sys.argv = args
return doctest.testmod(sys.modules.get(__name__))

py2 = doctest.register_optionflag("py2")
py3 = doctest.register_optionflag("py3")

class ConditionalChecker(doctest.OutputChecker):
def check_output(self, want, got, optionflags):
if (optionflags & py3) and (sys.version_info[0] < 3):
return True
if (optionflags & py2) and (sys.version_info[0] >= 3):
return True
return doctest.OutputChecker.check_output(self, want, got, optionflags)

runner = doctest.DocTestRunner(ConditionalChecker())
for test in doctest.DocTestFinder().find(sys.modules.get(__name__)):
runner.run(test)

return doctest.TestResults(runner.failures, runner.tries)

if __name__ == '__main__':
print("running...")
Expand Down
Loading