Improved flexibility of SDL_MUSTLOCK

Author: a-hurst

doc/news.rst

@@ -52,6 +52,8 @@ Fixed Bugs:
   and fixed unit tests accordingly (issue #228).
 * Fixed various unit tests on big-endian platforms (PR #232).
 * Fixed 32-bit wraparound behaviour for ``SDL_TICKS_PASSED`` (PR #235).
+* Fixed ``SDL_MUSTLOCK`` to allow checking surface pointers in addition to
+  surfaces.
 
 
 0.9.11

sdl2/surface.py

@@ -43,7 +43,10 @@
 
 # Macros & inline functions
 
-SDL_MUSTLOCK = lambda s: ((s.flags & SDL_RLEACCEL) != 0)
+def SDL_MUSTLOCK(surf):
+    if hasattr(surf, "contents"):
+        surf = surf.contents
+    return surf.flags & SDL_RLEACCEL != 0
 
 
 # Structs & opaque typedefs