move the src/data validation into the main conditional

samizdatco · samizdatco · commit 07ad3a9a4aae · 2025-04-06T18:40:04.000-04:00
diff --git a/plotdevice/gfx/image.py b/plotdevice/gfx/image.py
@@ -63,10 +63,6 @@ def __init__(self, *args, **kwargs):
         elif args and args[0] is None:
             args.pop(0) # make image(None, 10,20, image=...) work properly for compat
 
-        # Validate that we have either a source or data
-        if not (src or data):
-            raise DeviceError("Image requires either a source (path/url/Image) or image data")
-
         # get an NSImage reference (once way or another)
         if data:
             self._nsImage = self._lazyload(data=data)
@@ -81,6 +77,9 @@ def __init__(self, *args, **kwargs):
             else:
                 invalid = "Not a valid image source: %r" % type(src)
                 raise DeviceError(invalid)
+        else:
+            undefined = "Image requires either a source (path/url/Image) or image data"
+            raise DeviceError(undefined)
 
         # set the bounds (in phases)
         if isinstance(src, Image):
