From 69b1233316841a4a483237027167697954b0118f Mon Sep 17 00:00:00 2001
From: lethliel <mstrigl@suse.de>
Date: Fri, 24 Apr 2020 10:26:16 +0200
Subject: [PATCH] add regex for python3 missing arguments err

add new regex and check for missing arguments.
The error message in python3 differs from the one in python2.

python3:
do_api() missing 1 required positional argument: 'url'

python2:
do_api() takes exactly 4 arguments (3 given)

To be compatible with python2 two checks are needed.
---
 osc/cmdln.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/osc/cmdln.py b/osc/cmdln.py
index 918a1da14b..807276d5fd 100644
--- a/osc/cmdln.py
+++ b/osc/cmdln.py
@@ -97,6 +97,9 @@ def introspect_handler_3(handler):
 _INCORRECT_NUM_ARGS_RE = re.compile(
     r"(takes [\w ]+ )(\d+)( arguments? \()(\d+)( given\))")
 
+_INCORRECT_NUM_ARGS_RE_PY3 = re.compile(
+    r"(missing\s+\d+.*)")
+
 # Static bits of man page
 MAN_HEADER = r""".TH %(ucname)s "1" "%(date)s" "%(name)s %(version)s" "User Commands"
 .SH NAME
@@ -1246,6 +1249,7 @@ def do_bar2(self, subcmd, opts, bar_one, bar_two):
                     raise
                 msg = ex.args[0]
                 match = _INCORRECT_NUM_ARGS_RE.search(msg)
+                match_py3 = _INCORRECT_NUM_ARGS_RE_PY3.search(msg)
                 if match:
                     msg = list(match.groups())
                     msg[1] = int(msg[1]) - 3
@@ -1254,6 +1258,8 @@ def do_bar2(self, subcmd, opts, bar_one, bar_two):
                     msg[3] = int(msg[3]) - 3
                     msg = ''.join(map(str, msg))
                     raise CmdlnUserError(msg)
+                elif match_py3:
+                    raise CmdlnUserError(match_py3.group(1))
                 else:
                     raise
         else: