Address complaints from pylint extensions

apport/crashdb.py

@@ -308,7 +308,7 @@ def known(self, report):
                     contents = dupdb_url.read().decode("UTF-8")
                 if "<title>404 Not Found" in contents:
                     continue
-            except (OSError, urllib.error.URLError):
+            except OSError:
                 # does not exist, failed to load, etc.
                 continue
 

apport/packaging_impl/apt_dpkg.py

@@ -465,7 +465,7 @@
         try:
             with urllib.request.urlopen(url) as response:
                 content = response.read()
-        except (urllib.error.URLError, urllib.error.HTTPError):
+        except urllib.error.URLError:
             apport.logging.warning("cannot connect to: %s", urllib.parse.unquote(url))
             return None
         except OSError:
@@ -1736,7 +1736,7 @@
                 ) as response:
                     response.read()
                     return user, ppa_name
-            except (urllib.error.URLError, urllib.error.HTTPError):
+            except urllib.error.URLError:
                 index += 1
                 if index == len(components):
                     if try_ppa:
@@ -1786,7 +1786,7 @@
                 debug_entry.comps = ["main/debug"]
                 debug_entry.suites = [release_codename]
                 return [main_entry, debug_entry]
-            except (urllib.error.URLError, urllib.error.HTTPError):
+            except urllib.error.URLError:
                 return [main_entry]
         else:
             ppa_line = (
@@ -1797,7 +1797,7 @@
                 with contextlib.closing(urllib.request.urlopen(debug_url)) as response:
                     response.read()
                 add_debug = " main/debug"
-            except (urllib.error.URLError, urllib.error.HTTPError):
+            except urllib.error.URLError:
                 add_debug = ""
             return [
                 SourceEntry(ppa_line + add_debug),

apport/report.py

@@ -1244,7 +1244,7 @@ def search_bug_patterns(self, url: str | None) -> str | None:
         try:
             with urllib.request.urlopen(url) as request:
                 patterns = request.read().decode("UTF-8", errors="replace")
-        except (OSError, urllib.error.URLError):
+        except OSError:
             # doesn't exist or failed to load
             return None
 

data/apport

@@ -809,13 +809,13 @@ def receive_arguments_via_socket() -> argparse.Namespace:
         sys.exit(0)
 
     # Extract and validate the fd
-    fds = listen_fds()
-    if len(fds) < 1:
+    socket_fds = listen_fds()
+    if len(socket_fds) < 1:
         logging.getLogger().error("Invalid socket activation, no fd provided")
         sys.exit(1)
 
     # Open the socket
-    sock = socket.fromfd(int(fds[0]), socket.AF_UNIX, socket.SOCK_STREAM)
+    sock = socket.fromfd(int(socket_fds[0]), socket.AF_UNIX, socket.SOCK_STREAM)
     atexit.register(sock.shutdown, socket.SHUT_RDWR)
 
     # Replace stdin by the socket activation fd

pyproject.toml

@@ -53,7 +53,9 @@ load-plugins = [
     "pylint.extensions.dunder",
     "pylint.extensions.eq_without_hash",
     "pylint.extensions.no_self_use",
+    "pylint.extensions.overlapping_exceptions",
     "pylint.extensions.private_import",
+    "pylint.extensions.redefined_variable_type",
     "pylint.extensions.set_membership",
     "pylint.extensions.typing",
 ]

tests/integration/test_problem_report.py

@@ -142,13 +142,13 @@ def test_extract_keys(self):
             os.path.join(self.workdir, "nonexistent"),
         )
         # Test exception handling: Non-binary and nonexistent key
-        tests = [
+        exception_tests = [
             (ValueError, "Txt"),
             (ValueError, ["Foo", "Txt"]),
             (KeyError, "Bar"),
             (KeyError, ["Foo", "Bar"]),
         ]
-        for exc, keys_arg in tests:
+        for exc, keys_arg in exception_tests:
             report.seek(0)
             self.assertRaises(exc, pr.extract_keys, report, keys_arg, self.workdir)