Update tests and pypi categories

BoboTiG · BoboTiG · commit 629b0618e436 · 2015-04-14T16:03:12.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -6,3 +6,4 @@ MANIFEST*
 *.png.old
 *.raw
 test/test-linux
+test/.*
diff --git a/mss.py b/mss.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
+# coding: utf-8
 ''' A cross-platform multi-screen shot module in pure python using ctypes.
 
     This module is maintained by Mickaël Schoentgen <mickael@jmsinfo.co>.
@@ -314,7 +314,7 @@ def save_img(self, data, width, height, output):
         self.debug('save_img', 'url', url)
         self.debug('save_img', 'dest', dest)
         if not dest:
-            err = 'MSS : CGImageDestinationCreateWithURL() failed.'
+            err = 'MSS: CGImageDestinationCreateWithURL() failed.'
             raise ScreenshotError(err)
 
         CGImageDestinationAddImage(dest, data, None)
@@ -507,9 +507,8 @@ def pix(pixel, _resultats={}, b=pack):
         self.debug('get_pixels', 'bmask', bmask)
         pixels = [pix(get_pix(ximage, x, y))
                   for y in range(height) for x in range(width)]
-        self.image = b''.join(pixels)
-
         self.xlib.XDestroyImage(ximage)
+        self.image = b''.join(pixels)
         return self.image
 
 
diff --git a/setup.py b/setup.py
@@ -51,6 +51,8 @@
         'Programming Language :: Python :: 3.5',
         'Topic :: Multimedia :: Graphics :: Capture',
         'Topic :: Multimedia :: Graphics :: Capture :: Screen Capture',
+        'Topic :: Software Development'
+        'Topic :: Software Development :: Libraries'
         'Topic :: Software Development :: Libraries :: Python Modules'
     ],
     url='https://github.com/BoboTiG/python-mss'
diff --git a/test/screenshot.py b/test/screenshot.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
+# coding: utf-8
 ''' A simple screen shot script.
     Use of python-mss: https://github.com/BoboTiG/python-mss/
     pip install --upgrade mss
@@ -18,4 +18,4 @@
 if __name__ == '__main__':
     mss = mss_class()
     for filename in mss.save(output='monitor-%d.png', screen=1):
-        print('File: "{}" created.'.format(filename))
+        print('File: "{0}" created.'.format(filename))
diff --git a/test/test-linux.c b/test/test-linux.c
@@ -92,7 +92,7 @@ void full_screen(void) {
     }
     */
 
-    XFree(image);
+    XDestroyImage(image);
     XCloseDisplay(display);
 
     gettimeofday(&end, NULL);
@@ -150,8 +150,8 @@ void each_screen(void) {
                 pixels[x * 3 + offset + 2] =  pixel & image->blue_mask;
             }
         }
-        XFree(image);
-        XFree(crtc_info);
+        XDestroyImage(image);
+        XRRFreeCrtcInfo(crtc_info);
 
         gettimeofday(&end, NULL);
         printf("Screen %d: %dx%d @ %u msec\n", n, width, height, (1000000 * end.tv_sec + end.tv_usec) - (1000000 * start.tv_sec + start.tv_usec));
@@ -162,7 +162,7 @@ void each_screen(void) {
         fwrite(pixels, sizeof(unsigned char), sizeof(unsigned char) * width * height * 3, fh);
         fclose(fh);
     }
-    XFree(monitors);
+    XRRFreeScreenResources(monitors);
     XCloseDisplay(display);
 
     return;
diff --git a/test/test-raw.py b/test/test-raw.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
+# coding: utf-8
 
 # Test raw data generated by test-linux.
 
@@ -49,23 +49,23 @@ def save_img(data, width, height, output):
             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)
+            msg = 'Impossible to write data to file "{0}".'.format(output)
             raise ScreenshotError(msg)
 
 if len(sys.argv) < 4:
-    print('python {} data.raw width height'.format(sys.argv[0]))
+    print('python {0} data.raw width height'.format(sys.argv[0]))
 else:
     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])
+        output = '{0}.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, output)
         else:
             mss = mss.MSS()
             mss.save_img(data, width, height, output)
-        print('File {} created.'.format(output))
+        print('File {0} created.'.format(output))
         sys.exit(0)
-    print('Impossible to get contents of "{}".'.format(sys.argv[1]))
+    print('Impossible to get contents of "{0}".'.format(sys.argv[1]))

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ void full_screen(void) {`
`92`	`92`	`}`
`93`	`93`	`*/`
`94`	`94`
`95`		`- XFree(image);`
	`95`	`+ XDestroyImage(image);`
`96`	`96`	`XCloseDisplay(display);`
`97`	`97`
`98`	`98`	`gettimeofday(&end, NULL);`
`@@ -150,8 +150,8 @@ void each_screen(void) {`
`150`	`150`	`pixels[x * 3 + offset + 2] = pixel & image->blue_mask;`
`151`	`151`	`}`
`152`	`152`	`}`
`153`		`- XFree(image);`
`154`		`- XFree(crtc_info);`
	`153`	`+ XDestroyImage(image);`
	`154`	`+ XRRFreeCrtcInfo(crtc_info);`
`155`	`155`
`156`	`156`	`gettimeofday(&end, NULL);`
`157`	`157`	`printf("Screen %d: %dx%d @ %u msec\n", n, width, height, (1000000 * end.tv_sec + end.tv_usec) - (1000000 * start.tv_sec + start.tv_usec));`
`@@ -162,7 +162,7 @@ void each_screen(void) {`
`162`	`162`	`fwrite(pixels, sizeof(unsigned char), sizeof(unsigned char) * width * height * 3, fh);`
`163`	`163`	`fclose(fh);`
`164`	`164`	`}`
`165`		`- XFree(monitors);`
	`165`	`+ XRRFreeScreenResources(monitors);`
`166`	`166`	`XCloseDisplay(display);`
`167`	`167`
`168`	`168`	`return;`