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

2018-11-03 13:42:20 +00:00
parent 4cb838d978 21725e9304
commit 6befdf8b46
33 changed files with 315 additions and 41 deletions
--- a/src/_pytest/config/argparsing.py
+++ b/src/_pytest/config/argparsing.py
@@ -152,7 +152,7 @@ class ArgumentError(Exception):
 class Argument(object):
    """class that mimics the necessary behaviour of optparse.Option

-    its currently a least effort implementation
+    it's currently a least effort implementation
    and ignoring choices and integer prefixes
    https://docs.python.org/3/library/optparse.html#optparse-standard-option-types
    """