Linux: Handle bad display value

BoboTiG · Mickaël Schoentgen · commit 434be4456166 · 2017-08-05T22:56:20.000+02:00
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -3,6 +3,7 @@ General informations:
 * OS name: _Debian GNU/Linux_
 * OS version: __sid__
 * OS architecture: _64 bits_
+* Monitor(s)'s resolution: 
 * Result of the command `python --version`: __Python 3.5.1+__
 
 
diff --git a/.travis.yml b/.travis.yml
@@ -16,12 +16,15 @@ addons:
 before_install:
   - xpra --xvfb="Xorg +extension RANDR -config `pwd`/tests/res/dummy.xorg.conf -logfile ${HOME}/.xpra/xorg.log" start :42
 
+env:
+  - DISPLAY=":42"
+
 install:
   - pip install flake8 numpy pillow pylint
-  - python setup.py install
+  - pip install -e .
 
 script:
-  - py.test --display=":42.0"
+  - py.test --showlocals --display=":42.0"
   - flake8 mss
   - pylint mss
 
diff --git a/CHANGELOG b/CHANGELOG
@@ -8,6 +8,7 @@ dev     2017/xx/xx
       - tests: a lot of tests added for better coverage
       - MSS: possibility to use custom class to handle screen shot data
       - Mac: handle screenshot's width not divisible by 16 (fix #14, #19, #21)
+      - Linux: handle bad display value
 
 3.0.1   2017/07/06
       - fix examples links
diff --git a/mss/darwin.py b/mss/darwin.py
@@ -32,8 +32,8 @@ class CGPoint(ctypes.Structure):
     _fields_ = [('x', cgfloat()), ('y', cgfloat())]
 
     def __repr__(self):
-        return '{0}(left={cls.x} top={cls.y})'.format(
-            type(self).__name__, cls=self)
+        return '{0}(left={1} top={2})'.format(
+            type(self).__name__, self.x, self.y)
 
 
 class CGSize(ctypes.Structure):
@@ -42,8 +42,8 @@ class CGSize(ctypes.Structure):
     _fields_ = [('width', cgfloat()), ('height', cgfloat())]
 
     def __repr__(self):
-        return '{0}(width={cls.width} height={cls.height})'.format(
-            type(self).__name__, cls=self)
+        return '{0}(width={1} height={2})'.format(
+            type(self).__name__, self.width, self.height)
 
 
 class CGRect(ctypes.Structure):
@@ -52,8 +52,8 @@ class CGRect(ctypes.Structure):
     _fields_ = [('origin', CGPoint), ('size', CGSize)]
 
     def __repr__(self):
-        return '{0}<{cls.origin} {cls.size}>'.format(
-            type(self).__name__, cls=self)
+        return '{0}<{1} {2}>'.format(
+            type(self).__name__, self.origin, self.size)
 
 
 class MSS(MSSBase):
diff --git a/mss/linux.py b/mss/linux.py
@@ -136,6 +136,9 @@ def __init__(self, display=None):
         if not isinstance(display, bytes):
             display = display.encode('utf-8')
 
+        if b':' not in display:
+            raise ScreenShotError('Bad display value.', locals())
+
         x11 = ctypes.util.find_library('X11')
         if not x11:
             raise ScreenShotError('No X11 library found.', locals())
@@ -149,7 +152,6 @@ def __init__(self, display=None):
         self._set_argtypes()
         self._set_restypes()
 
-        # TODO: check if `display` is openable, else SEGFAULT
         self.display = self.xlib.XOpenDisplay(display)
         try:
             self.display.contents
diff --git a/mss/screenshot.py b/mss/screenshot.py
@@ -128,9 +128,9 @@ def rgb(self):
         """
 
         if not self.__rgb:
-            self.__rgb = bytearray(self.height * self.width * 3)
-            self.__rgb[0::3], self.__rgb[1::3], self.__rgb[2::3] = \
+            rgb = bytearray(self.height * self.width * 3)
+            rgb[0::3], rgb[1::3], rgb[2::3] = \
                 self.raw[2::4], self.raw[1::4], self.raw[0::4]
-            self.__rgb = bytes(self.__rgb)
+            self.__rgb = bytes(rgb)
 
         return self.__rgb
diff --git a/tests/test_find_monitors.py b/tests/test_find_monitors.py
@@ -26,10 +26,6 @@ def test_dimensions(sct, is_travis):
     if not is_travis:
         assert mon['width'] > 0
         assert mon['height'] > 0
-
-
-def test_dimensions_travis(sct, is_travis):
-    mon = sct.monitors[1]
-    if is_travis:
+    else:
         assert mon['width'] == 1920
         assert mon['height'] == 1440
diff --git a/tests/test_gnu_linux.py b/tests/test_gnu_linux.py
@@ -49,15 +49,17 @@ def test_factory_systems(monkeypatch):
         mss.mss()
 
 
-def test_implementation(monkeypatch):
+def test_implementation(monkeypatch, is_travis):
     import mss
 
     # Bad `display` type
-    mss.mss(display=TEXT(':0'))
+    if not is_travis:
+        mss.mss(display=TEXT(':0'))
+    else:
+        mss.mss(display=TEXT(':42'))
 
-    # TODO: SEGFAULT
-    #with pytest.raises(ScreenShotError):
-    #    mss.mss(display=text('0'))
+    with pytest.raises(ScreenShotError):
+        mss.mss(display=TEXT('0'))
 
     # No `DISPLAY` in envars
     monkeypatch.delenv('DISPLAY')
diff --git a/tests/test_implementation.py b/tests/test_implementation.py
@@ -65,8 +65,8 @@ def test_repr(sct):
 
 def test_factory_basics(monkeypatch):
     # Current system
-    sct = mss.mss()
-    assert isinstance(sct, MSSBase)
+    with mss.mss() as sct:
+        assert isinstance(sct, MSSBase)
 
     # Unknown
     monkeypatch.setattr(platform, 'system', lambda: 'Chuck Norris')
diff --git a/tests/test_save.py b/tests/test_save.py
@@ -19,16 +19,15 @@ def test_files_exist(sct):
     assert os.path.isfile('fullscreen.png')
 
 
-def test_callback():
+def test_callback(sct):
 
     def on_exists(fname):
         if os.path.isfile(fname):
             new_file = fname + '.old'
             os.rename(fname, new_file)
 
-    with mss.mss() as sct:
-        filename = sct.shot(mon=0, output='mon0.png', callback=on_exists)
-        assert os.path.isfile(filename)
+    filename = sct.shot(mon=0, output='mon0.png', callback=on_exists)
+    assert os.path.isfile(filename)
 
-        filename = sct.shot(output='mon1.png', callback=on_exists)
-        assert os.path.isfile(filename)
+    filename = sct.shot(output='mon1.png', callback=on_exists)
+    assert os.path.isfile(filename)
