Better use of Exceptions mechanism

BoboTiG · BoboTiG · commit 848f42f3c003 · 2016-12-30T13:00:08.000+01:00
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -51,15 +51,15 @@
 
 # General information about the project.
 project = 'Python MSS'
-copyright = '2016, Tiger-222'
+copyright = '2013-2016, Tiger-222'
 author = 'Tiger-222'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '2.0.18'
+version = '2.0.19'
 # The full version, including alpha/beta/rc tags.
 release = 'latest'
 
diff --git a/mss/__init__.py b/mss/__init__.py
@@ -13,7 +13,7 @@
 from .exception import ScreenshotError
 from .factory import mss
 
-__version__ = '2.0.18'
+__version__ = '2.0.19'
 __author__ = "Mickaël 'Tiger-222' Schoentgen"
 __copyright__ = '''
     Copyright (c) 2013-2016, Mickaël 'Tiger-222' Schoentgen
diff --git a/mss/base.py b/mss/base.py
@@ -111,8 +111,7 @@ def save(self, mon=0, output='monitor-%d.png', callback=None):
             try:
                 monitor = self.monitors[mon_number]
             except IndexError:
-                err = 'Monitor {0} does not exist.'.format(mon)
-                raise ScreenshotError(err)
+                raise ScreenshotError('Monitor does not exist.', locals())
 
             if '%d' in output:
                 output = output.replace('%d', str(mon_number))
@@ -159,5 +158,4 @@ def to_png(self, data, output):
             fileh.write(b''.join(iend))
             return
 
-        err = 'Error writing data to "{0}".'.format(output)
-        raise ScreenshotError(err)
+        raise ScreenshotError('Error writing data to file.', output)
diff --git a/mss/darwin.py b/mss/darwin.py
@@ -60,7 +60,7 @@ def __init__(self):
 
         coregraphics = find_library('CoreGraphics')
         if not coregraphics:
-            raise ScreenshotError('No CoreGraphics library found.')
+            raise ScreenshotError('No CoreGraphics library found.', locals())
         self.core = cdll.LoadLibrary(coregraphics)
 
         self._set_argtypes()
@@ -146,8 +146,8 @@ def get_pixels(self, monitor):
 
         image_ref = self.core.CGWindowListCreateImage(rect, 1, 0, 0)
         if not image_ref:
-            err = 'CoreGraphics.CGWindowListCreateImage() failed.'
-            raise ScreenshotError(err)
+            raise ScreenshotError(
+                'CoreGraphics.CGWindowListCreateImage() failed.', locals())
 
         self.width = int(self.core.CGImageGetWidth(image_ref))
         self.height = int(self.core.CGImageGetHeight(image_ref))
diff --git a/mss/factory.py b/mss/factory.py
@@ -28,7 +28,6 @@ def mss(**kwargs):
     elif operating_system == 'windows':
         from .windows import MSS
     else:
-        err = 'System "{0}" not implemented.'.format(operating_system)
-        raise ScreenshotError(err)
+        raise ScreenshotError('System not (yet?) implemented.', locals())
 
     return MSS(**kwargs)
diff --git a/mss/linux.py b/mss/linux.py
@@ -96,19 +96,19 @@ def __init__(self, display=None):
             try:
                 display = environ['DISPLAY']
             except KeyError:
-                raise ScreenshotError(
-                    '$DISPLAY not set. Stopping to prevent segfault.')
+                raise ScreenshotError('$DISPLAY not set.', locals())
+
         if not isinstance(display, bytes):
             display = bytes(display, 'utf-8')
 
         x11 = find_library('X11')
         if not x11:
-            raise ScreenshotError('No X11 library found.')
+            raise ScreenshotError('No X11 library found.', locals())
         self.xlib = cdll.LoadLibrary(x11)
 
         xrandr = find_library('Xrandr')
         if not xrandr:
-            raise ScreenshotError('No Xrandr extension found.')
+            raise ScreenshotError('No Xrandr extension found.', locals())
         self.xrandr = cdll.LoadLibrary(xrandr)
 
         self._set_argtypes()
@@ -118,8 +118,8 @@ def __init__(self, display=None):
         try:
             self.display.contents
         except ValueError:
-            raise ScreenshotError('Cannot open display "{0}".'.format(
-                str(display.decode('utf-8'))))
+            raise ScreenshotError('Cannot open display.', locals())
+
         self.root = self.xlib.XDefaultRootWindow(
             self.display, self.xlib.XDefaultScreen(self.display))
 
@@ -156,9 +156,8 @@ def validate(value, _, args):
             '''
 
             if value == 0:
-                err = 'xrandr.XRRGetScreenResources() failed.'
-                err += ' NULL pointer received.'
-                raise ScreenshotError(err)
+                raise ScreenshotError(('xrandr.XRRGetScreenResources() failed.'
+                                       ' NULL pointer received.'), locals())
 
             return args
 
@@ -229,11 +228,7 @@ def get_pixels(self, monitor):
                                      monitor['width'], monitor['height'],
                                      0x00ffffff, 2)  # ZPIXMAP
         if not ximage:
-            err = 'xlib.XGetImage() failed. Monitor informations: '
-            for key, val in sorted(monitor.items()):
-                err = '{0}{1}: {2}, '.format(err, key, val)
-            err = err.strip(', ')
-            raise ScreenshotError(err)
+            raise ScreenshotError('xlib.XGetImage() failed.', locals())
 
         # Raw pixels values conversion
         bpp = ximage.contents.bits_per_pixel
@@ -243,9 +238,8 @@ def get_pixels(self, monitor):
                 c_ubyte * self.height * self.width * 4))
             self.image = self.bgra_to_rgb(bytearray(data.contents))
         else:
-            err = ('Not implemented for this configuration '
-                   '([XImage] bits per pixel = {0}).')
-            raise ScreenshotError(err.format(bpp))
+            raise ScreenshotError(('[XImage] bits per pixel value '
+                                   'not (yet?) implemented.'), locals())
 
         # Free
         self.xlib.XDestroyImage(ximage)
diff --git a/mss/windows.py b/mss/windows.py
@@ -153,7 +153,7 @@ def get_pixels(self, monitor):
             bits = windll.gdi32.GetDIBits(
                 memdc, bmp, 0, monitor['height'], image_data, bmi, 0)
             if bits != self.height:
-                raise ScreenshotError('gdi32.GetDIBits() failed.')
+                raise ScreenshotError('gdi32.GetDIBits() failed.', locals())
         finally:
             # Clean up
             if srcdc:
