osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/39909?usp=email )
Change subject: *.py: ignore: E722 Do not use bare `except`
......................................................................
*.py: ignore: E722 Do not use bare `except`
Let the ruff linter not complain about the existing cases of "Do not use
bare `except`" so we get the linter to pass without changing the
existing logic here. With this we don't disable the check globally, so
we can consider making stricter excepts in new code.
Change-Id: Iaef20d47cd171aab23e516e7f7516caf98264249
---
M scripts/obs/lib/srcpkg.py
M scripts/verify_log_statements.py
2 files changed, 3 insertions(+), 3 deletions(-)
Approvals:
pespin: Looks good to me, but someone else must approve
osmith: Looks good to me, approved
Jenkins Builder: Verified
fixeria: Looks good to me, but someone else must approve
diff --git a/scripts/obs/lib/srcpkg.py b/scripts/obs/lib/srcpkg.py
index b5286d8..fc39563 100644
--- a/scripts/obs/lib/srcpkg.py
+++ b/scripts/obs/lib/srcpkg.py
@@ -57,7 +57,7 @@
print(f"{project}: getting version from debian/changelog")
version = lib.debian.get_last_version_from_changelog(project)
return f"{version}.{count}-{commit}"
- except:
+ except: # noqa: E722
print(f"{project}: using 0.0.0 as version")
return f"0.0.0.{count}-{commit}"
diff --git a/scripts/verify_log_statements.py b/scripts/verify_log_statements.py
index e0bcce6..a7b27d6 100755
--- a/scripts/verify_log_statements.py
+++ b/scripts/verify_log_statements.py
@@ -86,7 +86,7 @@
# that are not in quotes, between separate string constants.
try:
quoted = eval('(' + quoted + '\n)' )
- except:
+ except: # noqa: E722
# hopefully eval broke because of some '## args' macro def
if debug:
ignored.append(error_found(f, log.start(), 'Ignoring', log.group(0)))
@@ -115,7 +115,7 @@
r.line = line
return errors_found
- except:
+ except: # noqa: E722
print("ERROR WHILE PROCESSING %r" % f, file=sys.stderr)
raise
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/39909?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: Iaef20d47cd171aab23e516e7f7516caf98264249
Gerrit-Change-Number: 39909
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/39911?usp=email )
Change subject: scripts/verify_log_statements: fix undefined name
......................................................................
scripts/verify_log_statements: fix undefined name
Append it to "errors_found" instead of undefined variable "ignored".
This makes it work similarly to further above:
# Skip 'LOG("bla" fmt )' strings that typically appear as #defines.
if fmt_re.match(quoted):
if debug:
errors_found.append(error_found(f, log.start(), 'Skipping define', log.group(0)))
continue
Fix the following bug:
scripts/verify_log_statements.py:92:11: F821 Undefined name `ignored`
|
90 | # hopefully eval broke because of some '## args' macro def
91 | if debug:
92 | ignored.append(error_found(f, log.start(), 'Ignoring', log.group(0)))
| ^^^^^^^ F821
93 | continue
|
Change-Id: I4661d4677a1f0fc8d595985e73e2632b9a83b7d6
---
M scripts/verify_log_statements.py
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
pespin: Looks good to me, but someone else must approve
fixeria: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/scripts/verify_log_statements.py b/scripts/verify_log_statements.py
index a7b27d6..1590799 100755
--- a/scripts/verify_log_statements.py
+++ b/scripts/verify_log_statements.py
@@ -89,7 +89,7 @@
except: # noqa: E722
# hopefully eval broke because of some '## args' macro def
if debug:
- ignored.append(error_found(f, log.start(), 'Ignoring', log.group(0)))
+ errors_found.append(error_found(f, log.start(), 'Ignoring', log.group(0)))
continue
# check for errors...
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/39911?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I4661d4677a1f0fc8d595985e73e2632b9a83b7d6
Gerrit-Change-Number: 39911
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Attention is currently required from: pespin.
osmith has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/39909?usp=email )
Change subject: *.py: ignore: E722 Do not use bare `except`
......................................................................
Patch Set 2: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/39909?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: Iaef20d47cd171aab23e516e7f7516caf98264249
Gerrit-Change-Number: 39909
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 04 Apr 2025 11:34:21 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes