Version 0.1.1

Author: BoboTiG

doc/CHANGELOG

@@ -3,7 +3,14 @@ History:
 <see Git checkin messages for history>
 
 devel   201y/mm/dd
-      - [test] warn the user in case of outdated MSS version
+      -
+
+0.1.1   2015/04/10
+      - little code review
+      - add doc/TESTING
+      - remove Bonus section from README.rst
+      - tests: remove test-linux binary
+      - MSSLinux: fix monitor count
 
 0.1.0   2015/04/10
       - fix code with YAPF tool

doc/TESTING

@@ -0,0 +1,19 @@
+The current MSS version was succesfully tested on these OS.
+You have another OS to add? Let us know, open a ticket on GitHub :)
+
+GNU/Linux:
+	Debian 8.0 (jessie)
+	Mageia 4.1
+	Ubuntu 14.04.2 LTS (Trusty Tahr)
+	Ubuntu 14.10 (Utopic Unicorn)
+	Zorin OS 9
+
+Mac OS X:
+	OS X 10.7 (Lion)
+	OS X 10.8 (Mountain Lion)
+
+Microsoft Windows:
+	Windows XP
+	Windows 7
+	Windows 8
+	Windows 8.1

mss.py

@@ -13,7 +13,7 @@
 
 from __future__ import (unicode_literals, print_function)
 
-__version__ = '0.1.0'
+__version__ = '0.1.1'
 __author__ = "Mickaël 'Tiger-222' Schoentgen"
 __copyright__ = '''
     Copyright (c) 2013-2015, Mickaël 'Tiger-222' Schoentgen

test/test-raw.py

@@ -1,65 +1,71 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-# Test raw data.
+# Test raw data generated by test-linux.
 
 import mss
-from struct import pack
-import os.path
-import zlib
 import sys
 
+if mss.__version__ < '0.1.0':
+    from struct import pack
+    import os.path
+    import zlib
 
-def save_img(data, width, height, output):
-    ''' Dump data to the image file.
-        Pure python PNG implementation.
-        Image represented as RGB tuples, no interlacing.
-        http://inaps.org/journal/comment-fonctionne-le-png
-    '''
+    # Copied from MSS.save_img()
+    # @deprecated
+    def save_img(data, width, height, output):
+        ''' Dump data to the image file.
+            Pure python PNG implementation.
+            Image represented as RGB tuples, no interlacing.
+            http://inaps.org/journal/comment-fonctionne-le-png
+        '''
 
-    to_take = (width * 3 + 3) & -4
-    padding = 0 if to_take % 8 == 0 else (to_take % 8) // 2
-    scanlines = b''.join(
-        [b'0' + data[(y * to_take):(y * to_take) + to_take - padding]
-         for y in range(height)])
+        to_take = (width * 3 + 3) & -4
+        padding = 0 if to_take % 8 == 0 else (to_take % 8) // 2
+        scanlines = b''.join(
+            [b'0' + data[(y * to_take):(y * to_take) + to_take - padding]
+             for y in range(height)])
 
-    magic = pack(b'>8B', 137, 80, 78, 71, 13, 10, 26, 10)
+        magic = pack(b'>8B', 137, 80, 78, 71, 13, 10, 26, 10)
 
-    # Header: size, marker, data, CRC32
-    ihdr = [b'', b'IHDR', b'', b'']
-    ihdr[2] = pack(b'>2I5B', width, height, 8, 2, 0, 0, 0)
-    ihdr[3] = pack(b'>I', zlib.crc32(b''.join(ihdr[1:3])) & 0xffffffff)
-    ihdr[0] = pack(b'>I', len(ihdr[2]))
+        # Header: size, marker, data, CRC32
+        ihdr = [b'', b'IHDR', b'', b'']
+        ihdr[2] = pack(b'>2I5B', width, height, 8, 2, 0, 0, 0)
+        ihdr[3] = pack(b'>I', zlib.crc32(b''.join(ihdr[1:3])) & 0xffffffff)
+        ihdr[0] = pack(b'>I', len(ihdr[2]))
 
-    # Data: size, marker, data, CRC32
-    idat = [b'', b'IDAT', b'', b'']
-    idat[2] = zlib.compress(scanlines, 9)
-    idat[3] = pack(b'>I', zlib.crc32(b''.join(idat[1:3])) & 0xffffffff)
-    idat[0] = pack(b'>I', len(idat[2]))
+        # Data: size, marker, data, CRC32
+        idat = [b'', b'IDAT', b'', b'']
+        idat[2] = zlib.compress(scanlines, 9)
+        idat[3] = pack(b'>I', zlib.crc32(b''.join(idat[1:3])) & 0xffffffff)
+        idat[0] = pack(b'>I', len(idat[2]))
 
-    # Footer: size, marker, None, CRC32
-    iend = [b'', b'IEND', b'', b'']
-    iend[3] = pack(b'>I', zlib.crc32(iend[1]) & 0xffffffff)
-    iend[0] = pack(b'>I', len(iend[2]))
+        # Footer: size, marker, None, CRC32
+        iend = [b'', b'IEND', b'', b'']
+        iend[3] = pack(b'>I', zlib.crc32(iend[1]) & 0xffffffff)
+        iend[0] = pack(b'>I', len(iend[2]))
 
-    with open(output, 'wb') as fileh:
-        fileh.write(
-            magic + b''.join(ihdr) + b''.join(idat) + b''.join(iend))
-    if not os.path.isfile(output):
-        msg = 'Impossible to write data to file "{}".'.format(output)
-        raise ScreenshotError(msg)
+        with open(output, 'wb') as fileh:
+            fileh.write(
+                magic + b''.join(ihdr) + b''.join(idat) + b''.join(iend))
+        if not os.path.isfile(output):
+            msg = 'Impossible to write data to file "{}".'.format(output)
+            raise ScreenshotError(msg)
 
 if len(sys.argv) < 4:
-    print('python {0} data.raw width height'.format(sys.argv[0]))
+    print('python {} data.raw width height'.format(sys.argv[0]))
 else:
-    with open(sys.argv[1], 'rb') as f:
-        data = f.read()
+    with open(sys.argv[1], 'rb') as fileh:
+        data = fileh.read()
         width = int(sys.argv[2])
         height = int(sys.argv[3])
+        output = '{}.png'.format(sys.argv[1])
         if mss.__version__ < '0.1.0':
             print('Outdated version of MSS, please `pip install --upgrade mss`')
-            save_img(data, width, height, sys.argv[1] + '.png')
+            save_img(data, width, height, output)
         else:
             mss = mss.MSS()
-            mss.save_img(data, width, height, sys.argv[1] + '.png')
-        print('File {}.png created.'.format(sys.argv[1]))
+            mss.save_img(data, width, height, output)
+        print('File {} created.'.format(output))
+        sys.exit(0)
+    print('Impossible to get contents of "{}".'.format(sys.argv[1]))