Merge remote-tracking branch 'upstream/master' into release-5.1.0

2019-08-09 12:36:19 -03:00
parent ec76f70d71 5ecac3c861
commit 2f065a555f
34 changed files with 621 additions and 204 deletions
--- a/testing/python/collect.py
+++ b/testing/python/collect.py
@@ -1146,7 +1146,7 @@ def test_unorderable_types(testdir):
 def test_collect_functools_partial(testdir):
    """
    Test that collection of functools.partial object works, and arguments
-    to the wrapped functions are dealt correctly (see #811).
+    to the wrapped functions are dealt with correctly (see #811).
    """
    testdir.makepyfile(
        """