Merge branch 'master' into doxygen

Browse source

The way Python docstrings are indented has changed on master, so use the
standard inspect module in Python autodoc unit test to ignore the differences
in their indentation level between -builtin and non-builtin cases to make the
test still pass with the branch version, which avoids the use of different
(but almost identical) values in the test itself.

...

This commit is contained in:

Vadim Zeitlin 2016-12-05 02:14:51 +01:00

parent 658f92a993 3546d096a7

commit e668c47b70

1094 changed files with 39390 additions and 11483 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

831

Source/Modules/python.cxx

View file

File diff suppressed because it is too large Load diff