Skip to content

Commit 93f205c

Browse files
committed
mypy: Ignore 'osc_msg' injected into exceptions
1 parent 62c75cb commit 93f205c

1 file changed

Lines changed: 21 additions & 20 deletions

File tree

osc/core.py

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3777,12 +3777,12 @@ def show_project_meta(apiurl: str, prj: str, rev: Optional[str] = None, blame=No
37773777
f = http_GET(url)
37783778
except HTTPError as e:
37793779
error_help = "%d" % e.code
3780-
os_err = e.hdrs.get('X-Opensuse-Errorcode')
3780+
os_err = e.hdrs.get('X-Opensuse-Errorcode') # type: ignore[attr-defined]
37813781
if os_err:
37823782
error_help = "%s (%d) project: %s" % (os_err, e.code, prj)
37833783
if e.code == 404 and os_err == 'unknown_package':
37843784
error_help = 'option -r|--revision is not supported by this OBS version'
3785-
e.osc_msg = 'BuildService API error: %s' % error_help
3785+
e.osc_msg = 'BuildService API error: %s' % error_help # type: ignore[attr-defined]
37863786
raise
37873787
else:
37883788
if blame:
@@ -3813,7 +3813,7 @@ def show_package_trigger_reason(apiurl: str, prj: str, pac: str, repo: str, arch
38133813
f = http_GET(url)
38143814
return f.read()
38153815
except HTTPError as e:
3816-
e.osc_msg = 'Error getting trigger reason for project \'%s\' package \'%s\'' % (prj, pac)
3816+
e.osc_msg = 'Error getting trigger reason for project \'%s\' package \'%s\'' % (prj, pac) # type: ignore[attr-defined]
38173817
raise
38183818

38193819

@@ -3830,7 +3830,7 @@ def show_package_meta(apiurl: str, prj: str, pac: str, meta=False, blame=None):
38303830
f = http_GET(url)
38313831
return f.readlines()
38323832
except HTTPError as e:
3833-
e.osc_msg = 'Error getting meta for project \'%s\' package \'%s\'' % (unquote(prj), pac)
3833+
e.osc_msg = 'Error getting meta for project \'%s\' package \'%s\'' % (unquote(prj), pac) # type: ignore[attr-defined]
38343834
raise
38353835

38363836

@@ -3855,7 +3855,7 @@ def show_attribute_meta(apiurl: str, prj: str, pac, subpac, attribute, with_defa
38553855
f = http_GET(url)
38563856
return f.readlines()
38573857
except HTTPError as e:
3858-
e.osc_msg = 'Error getting meta for project \'%s\' package \'%s\'' % (prj, pac)
3858+
e.osc_msg = 'Error getting meta for project \'%s\' package \'%s\'' % (prj, pac) # type: ignore[attr-defined]
38593859
raise
38603860

38613861

@@ -3948,7 +3948,7 @@ def show_pattern_metalist(apiurl: str, prj: str):
39483948
f = http_GET(url)
39493949
tree = ET.parse(f)
39503950
except HTTPError as e:
3951-
e.osc_msg = 'show_pattern_metalist: Error getting pattern list for project \'%s\'' % prj
3951+
e.osc_msg = 'show_pattern_metalist: Error getting pattern list for project \'%s\'' % prj # type: ignore[attr-defined]
39523952
raise
39533953
r = sorted(node.get('name') for node in tree.getroot())
39543954
return r
@@ -3960,7 +3960,7 @@ def show_pattern_meta(apiurl: str, prj: str, pattern: str):
39603960
f = http_GET(url)
39613961
return f.readlines()
39623962
except HTTPError as e:
3963-
e.osc_msg = 'show_pattern_meta: Error getting pattern \'%s\' for project \'%s\'' % (pattern, prj)
3963+
e.osc_msg = 'show_pattern_meta: Error getting pattern \'%s\' for project \'%s\'' % (pattern, prj) # type: ignore[attr-defined]
39643964
raise
39653965

39663966

@@ -4709,7 +4709,7 @@ def create_submit_request(
47094709
root = ET.parse(f).getroot()
47104710
r = root.get('id')
47114711
except HTTPError as e:
4712-
if e.hdrs.get('X-Opensuse-Errorcode') == "submit_request_rejected":
4712+
if e.hdrs.get('X-Opensuse-Errorcode') == "submit_request_rejected": # type: ignore[attr-defined]
47134713
print('WARNING: As the project is in maintenance, a maintenance incident request is')
47144714
print('WARNING: being created (instead of a regular submit request). If this is not your')
47154715
print('WARNING: intention please revoke it to avoid unnecessary work for all involved parties.')
@@ -6190,7 +6190,8 @@ def branch_pkg(
61906190
raise oscerr.APIError('failed to branch: %s' % summary.text)
61916191
m = re.match(r"branch target package already exists: (\S+)/(\S+)", summary.text)
61926192
if not m:
6193-
e.msg += '\n' + summary.text
6193+
assert summary.text
6194+
e.msg += '\n' + summary.text # type: ignore[attr-defined]
61946195
raise
61956196
return (True, m.group(1), m.group(2), None, None)
61966197

@@ -7304,7 +7305,7 @@ def runservice(apiurl: str, prj: str, package: str):
73047305
try:
73057306
f = http_POST(u)
73067307
except HTTPError as e:
7307-
e.osc_msg = 'could not trigger service run for project \'%s\' package \'%s\'' % (prj, package)
7308+
e.osc_msg = 'could not trigger service run for project \'%s\' package \'%s\'' % (prj, package) # type: ignore[attr-defined]
73087309
raise
73097310

73107311
root = ET.parse(f).getroot()
@@ -7317,7 +7318,7 @@ def waitservice(apiurl: str, prj: str, package: str):
73177318
try:
73187319
f = http_POST(u)
73197320
except HTTPError as e:
7320-
e.osc_msg = 'The service for project \'%s\' package \'%s\' failed' % (prj, package)
7321+
e.osc_msg = 'The service for project \'%s\' package \'%s\' failed' % (prj, package) # type: ignore[attr-defined]
73217322
raise
73227323

73237324
root = ET.parse(f).getroot()
@@ -7334,7 +7335,7 @@ def mergeservice(apiurl: str, prj: str, package: str):
73347335
try:
73357336
f = http_POST(u)
73367337
except HTTPError as e:
7337-
e.osc_msg = 'could not merge service files in project \'%s\' package \'%s\'' % (prj, package)
7338+
e.osc_msg = 'could not merge service files in project \'%s\' package \'%s\'' % (prj, package) # type: ignore[attr-defined]
73387339
raise
73397340

73407341
root = ET.parse(f).getroot()
@@ -7356,7 +7357,7 @@ def rebuild(apiurl: str, prj: str, package: str, repo: str, arch: str, code=None
73567357
try:
73577358
f = http_POST(u)
73587359
except HTTPError as e:
7359-
e.osc_msg = 'could not trigger rebuild for project \'%s\' package \'%s\'' % (prj, package)
7360+
e.osc_msg = 'could not trigger rebuild for project \'%s\' package \'%s\'' % (prj, package) # type: ignore[attr-defined]
73607361
raise
73617362

73627363
root = ET.parse(f).getroot()
@@ -7528,17 +7529,17 @@ def cmdbuild(
75287529
try:
75297530
f = http_POST(u)
75307531
except HTTPError as e:
7531-
e.osc_msg = '%s command failed for project %s' % (cmd, project)
7532+
e.osc_msg = '%s command failed for project %s' % (cmd, project) # type: ignore[attr-defined]
75327533
if package:
7533-
e.osc_msg += ' package %s' % package
7534+
e.osc_msg += ' package %s' % package # type: ignore[attr-defined]
75347535
if arch:
7535-
e.osc_msg += ' arch %s' % arch
7536+
e.osc_msg += ' arch %s' % arch # type: ignore[attr-defined]
75367537
if repo:
7537-
e.osc_msg += ' repository %s' % repo
7538+
e.osc_msg += ' repository %s' % repo # type: ignore[attr-defined]
75387539
if code:
7539-
e.osc_msg += ' code=%s' % code
7540+
e.osc_msg += ' code=%s' % code # type: ignore[attr-defined]
75407541
if sysrq:
7541-
e.osc_msg += ' sysrq=%s' % code
7542+
e.osc_msg += ' sysrq=%s' % code # type: ignore[attr-defined]
75427543
raise
75437544

75447545
root = ET.parse(f).getroot()
@@ -7765,7 +7766,7 @@ def set_link_rev(apiurl: str, project: str, package: str, revision="", expand=Fa
77657766
f = http_GET(url)
77667767
root = ET.parse(f).getroot()
77677768
except HTTPError as e:
7768-
e.osc_msg = 'Unable to get _link file in package \'%s\' for project \'%s\'' % (package, project)
7769+
e.osc_msg = 'Unable to get _link file in package \'%s\' for project \'%s\'' % (package, project) # type: ignore[attr-defined]
77697770
raise
77707771
revision = _set_link_rev(apiurl, project, package, root, revision, expand=expand)
77717772
l = ET.tostring(root, encoding=ET_ENCODING)

0 commit comments

Comments
 (0)