mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-02-24 19:22:13 +01:00
Code

add regex for python3 missing arguments err

Browse Source 
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.
This commit is contained in:
lethliel 2020-04-24 10:26:16 +02:00
parent e98728d394
commit 69b1233316
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
osc/cmdln.py
View File

@ -97,6 +97,9 @@ _NOT_SPECIFIED = ("Not", "Specified")
_INCORRECT_NUM_ARGS_RE = re.compile( _INCORRECT_NUM_ARGS_RE = re.compile(
r"(takes [\w ]+ )(\d+)( arguments? \()(\d+)( given\))") r"(takes [\w ]+ )(\d+)( arguments? \()(\d+)( given\))")
_INCORRECT_NUM_ARGS_RE_PY3 = re.compile(
r"(missing\s+\d+.*)")
# Static bits of man page # Static bits of man page
MAN_HEADER = r""".TH %(ucname)s "1" "%(date)s" "%(name)s %(version)s" "User Commands" MAN_HEADER = r""".TH %(ucname)s "1" "%(date)s" "%(name)s %(version)s" "User Commands"
.SH NAME .SH NAME
@ -1246,6 +1249,7 @@ class Cmdln(RawCmdln):
raise raise
msg = ex.args[0] msg = ex.args[0]
match = _INCORRECT_NUM_ARGS_RE.search(msg) match = _INCORRECT_NUM_ARGS_RE.search(msg)
match_py3 = _INCORRECT_NUM_ARGS_RE_PY3.search(msg)
if match: if match:
msg = list(match.groups()) msg = list(match.groups())
msg[1] = int(msg[1]) - 3 msg[1] = int(msg[1]) - 3
@ -1254,6 +1258,8 @@ class Cmdln(RawCmdln):
msg[3] = int(msg[3]) - 3 msg[3] = int(msg[3]) - 3
msg = ''.join(map(str, msg)) msg = ''.join(map(str, msg))
raise CmdlnUserError(msg) raise CmdlnUserError(msg)
elif match_py3:
raise CmdlnUserError(match_py3.group(1))
else: else:
raise raise
else: else: