Linux: better handling of the display keyword

BoboTiG · BoboTiG · commit bb899ede07bc · 2016-10-05T11:17:13.000+02:00
diff --git a/docs/source/usage.rst b/docs/source/usage.rst
@@ -77,7 +77,7 @@ Into the Python's console
 .. code:: python
 
     >>> from mss import mss
-    >>> sct = mss(display=b':0')
+    >>> sct = mss(display=':0')
 
     # Retrieve monitors informations
     >>> displays = sct.enum_display_monitors()
diff --git a/mss/linux.py b/mss/linux.py
@@ -114,6 +114,8 @@ def __init__(self, display=None):
             except KeyError:
                 err = '$DISPLAY not set. Stopping to prevent segfault.'
                 raise ScreenshotError(err)
+        elif not isinstance(display, bytes):
+            display = bytes(display, 'utf-8')
 
         x11 = find_library('X11')
         if not x11:
diff --git a/test-linux.py b/test-linux.py
@@ -11,7 +11,7 @@
 def main():
     ''' Usage example with specified display. '''
 
-    display = b':0.0'
+    display = ':0.0'
     try:
         with MSS(display=display) as screenshotter:
             print('Screenshot of display "{0}"'.format(display))
