Use raise_sdl_err for more error checking

Author: a-hurst

sdl2/ext/draw.py

@@ -1,5 +1,6 @@
 import ctypes
 from .compat import isiterable, UnsupportedError
+from .common import raise_sdl_err
 from .array import to_ctypes
 from .color import convert_to_color
 from .. import surface, pixels, rect
@@ -93,11 +94,13 @@ def fill(target, color, area=None):
     if len(rects) > 2:
         rects, count = to_ctypes(rects, rect.SDL_Rect)
         rects = ctypes.cast(rects, ctypes.POINTER(rect.SDL_Rect))
-        surface.SDL_FillRects(rtarget, rects, count, color)
+        ret = surface.SDL_FillRects(rtarget, rects, count, color)
     elif len(rects) == 1:
-        surface.SDL_FillRect(rtarget, rects[0], color)
+        ret = surface.SDL_FillRect(rtarget, rects[0], color)
     else:
-        surface.SDL_FillRect(rtarget, None, color)
+        ret = surface.SDL_FillRect(rtarget, None, color)
+    if ret < 0:
+        raise_sdl_err("filling the surface")
 
 
 def line(target, color, dline, width=1):

sdl2/ext/msgbox.py

@@ -1,9 +1,9 @@
 from ctypes import byref, c_int
 from .color import Color
 from .compat import isiterable, utf8
-from .common import SDLError
+from .common import raise_sdl_err
 from .window import Window
-from .. import dll, error, SDL_PumpEvents, SDL_Window
+from .. import dll, SDL_PumpEvents, SDL_Window
 from .. import messagebox as mb
 
 __all__ = [
@@ -191,13 +191,7 @@ def show_messagebox(msgbox, window=None):
     if ret == 0:
         return msgbox._buttons[resp.value]
     else:
-        # NOTE: replace with raise_sdl_err now that it exists?
-        errmsg = error.SDL_GetError().decode('utf-8')
-        error.SDL_ClearError()
-        e = "Error encountered displaying message box"
-        if len(errmsg):
-            e += ": {0}".format(errmsg)
-        raise SDLError(e)
+        raise_sdl_err("displaying the message box")
 
 
 def show_alert(title, msg, msgtype=None, window=None):
@@ -229,11 +223,5 @@ def show_alert(title, msg, msgtype=None, window=None):
         window
     )
     SDL_PumpEvents()
-    if ret != 0:
-        # NOTE: replace with raise_sdl_err now that it exists?
-        errmsg = error.SDL_GetError().decode('utf-8')
-        error.SDL_ClearError()
-        e = "Error encountered displaying message box"
-        if len(errmsg):
-            e += ": {0}".format(errmsg)
-        raise SDLError(e)
+    if ret < 0:
+        raise_sdl_err("displaying the message box")