Apply workaround for multiple short options for Python <= 3.8 (#5526)

Apply workaround for multiple short options for Python <= 3.8
pytest-dev · Jun 29, 2019 · 497cd87 · 497cd87
2 parents d4a76a0 + 94a05e5
commit 497cd87
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -55,10 +55,8 @@ jobs:
     - env: TOXENV=py37-pluggymaster-xdist
     - env: TOXENV=py37-freeze
 
-    # Jobs only run via Travis cron jobs (currently daily).
     - env: TOXENV=py38-xdist
       python: '3.8-dev'
-      if: type = cron
 
     - stage: baseline
       env: TOXENV=py36-xdist

diff --git a/changelog/5523.bugfix.rst b/changelog/5523.bugfix.rst
@@ -0,0 +1 @@
+Fixed using multiple short options together in the command-line (for example ``-vs``) in Python 3.8+.
diff --git a/src/_pytest/config/argparsing.py b/src/_pytest/config/argparsing.py
@@ -358,7 +358,7 @@ def parse_args(self, args=None, namespace=None):
             getattr(args, FILE_OR_DIR).extend(argv)
         return args
 
-    if sys.version_info[:2] < (3, 8):  # pragma: no cover
+    if sys.version_info[:2] < (3, 9):  # pragma: no cover
         # Backport of https://github.com/python/cpython/pull/14316 so we can
         # disable long --argument abbreviations without breaking short flags.
         def _parse_optional(self, arg_string):
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fixed using multiple short options together in the command-line (for example ``-vs``) in Python 3.8+.