From 8563dd00e73fdef6ccb28fdc7c39bbe1d45ceee8 Mon Sep 17 00:00:00 2001
From: WyattBlue <wyattblue@auto-editor.com>
Date: Wed, 5 Feb 2025 21:46:21 -0500
Subject: [PATCH] Upgrade mypy to 1.15

---
 Makefile     | 2 +-
 av/error.pyi | 4 ++--
 av/error.pyx | 8 +++++---
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 2afb2e4c3..667ff3116 100644
--- a/Makefile
+++ b/Makefile
@@ -28,7 +28,7 @@ fate-suite:
 	rsync -vrltLW rsync://fate-suite.ffmpeg.org/fate-suite/ tests/assets/fate-suite/
 
 lint:
-	$(PIP) install -U black isort flake8 flake8-pyproject pillow numpy mypy==1.13.0 pytest
+	$(PIP) install -U black isort flake8 flake8-pyproject pillow numpy mypy==1.15.0 pytest
 	black --check av examples tests setup.py
 	flake8 av
 	isort --check-only --diff av examples tests
diff --git a/av/error.pyi b/av/error.pyi
index abbe2188c..e18f7334c 100644
--- a/av/error.pyi
+++ b/av/error.pyi
@@ -8,8 +8,8 @@ def tag_to_code(tag: bytes) -> int: ...
 def err_check(res: int, filename: str | None = None) -> int: ...
 
 class FFmpegError(Exception):
-    errno: int
-    strerror: str
+    errno: int | None
+    strerror: str | None
     filename: str
     log: tuple[int, tuple[int, str, str] | None]
 
diff --git a/av/error.pyx b/av/error.pyx
index ea2b9d216..b8b415207 100644
--- a/av/error.pyx
+++ b/av/error.pyx
@@ -95,11 +95,13 @@ class FFmpegError(Exception):
             pass
 
     def __str__(self):
-        msg = f"[Errno {self.errno}] {self.strerror}"
-
+        msg = ""
+        if self.errno is not None:
+            msg = f"{msg}[Errno {self.errno}] "
+        if self.strerror is not None:
+            msg = f"{msg}{self.strerror}"
         if self.filename:
             msg = f"{msg}: {self.filename!r}"
-
         if self.log:
             msg = f"{msg}; last error log: [{self.log[1].strip()}] {self.log[2].strip()}"