- Fix pylint: invalid attribute name

BoboTiG · BoboTiG · commit 84f048f43a1b · 2016-04-22T22:42:16.000+02:00
- Fix pylint: invalid argument name
- Fix pylint: unused argument
diff --git a/mss/linux.py b/mss/linux.py
@@ -4,14 +4,14 @@
 
 from __future__ import absolute_import
 
+import struct
 import sys
 from ctypes import (
     POINTER, Structure, byref, c_char_p, c_int, c_int32, c_long, c_uint,
     c_uint32, c_ulong, c_ushort, c_void_p, cast, cdll, create_string_buffer)
 from ctypes.util import find_library
 from os import environ
 from os.path import abspath, dirname, isfile, realpath
-from struct import pack
 
 from .helpers import MSS, ScreenshotError, arch
 
@@ -245,13 +245,14 @@ def get_pixels_slow(self, ximage):
         '''
 
         # @TODO: this part takes most of the time. Need a better solution.
-        def pix(pixel, _resultats={}, _b=pack):  # pylint: disable=W0102
+        def pix(pixel, _resultats={}, pack=struct.pack):  # pylint: disable=W0102
             ''' Apply shifts to a pixel to get the RGB values.
                 This method uses of memoization.
             '''
             if pixel not in _resultats:
-                _resultats[pixel] = _b(b'<B', (pixel & rmask) >> 16) + \
-                    _b(b'<B', (pixel & gmask) >> 8) + _b(b'<B', pixel & bmask)
+                _resultats[pixel] = pack(b'<B', (pixel & rmask) >> 16) + \
+                    pack(b'<B', (pixel & gmask) >> 8) + \
+                    pack(b'<B', pixel & bmask)
             return _resultats[pixel]
 
         width = ximage.contents.width
diff --git a/mss/windows.py b/mss/windows.py
@@ -40,11 +40,11 @@ def __init__(self):
     def _set_argtypes(self):
         ''' Functions arguments. '''
 
-        self.MONITORENUMPROC = WINFUNCTYPE(INT, DWORD, DWORD, POINTER(RECT),
+        self.monitorenumproc = WINFUNCTYPE(INT, DWORD, DWORD, POINTER(RECT),
                                            DOUBLE)
         windll.user32.GetSystemMetrics.argtypes = [INT]
         windll.user32.EnumDisplayMonitors.argtypes = [HDC, c_void_p,
-                                                      self.MONITORENUMPROC,
+                                                      self.monitorenumproc,
                                                       LPARAM]
         windll.user32.GetWindowDC.argtypes = [HWND]
         windll.gdi32.CreateCompatibleDC.argtypes = [HDC]
@@ -91,10 +91,13 @@ def enum_display_monitors(self, screen=-1):
             }
         else:
 
-            def _callback(monitor, dc, rect, data):
-                ''' Callback for MONITORENUMPROC() function, it will return
+            def _callback(monitor, data, rect, dc_):
+                ''' Callback for monitorenumproc() function, it will return
                     a RECT with appropriate values.
                 '''
+                del monitor
+                del data
+                del dc_
                 rct = rect.contents
                 monitors.append({
                     b'left': int(rct.left),
@@ -105,7 +108,7 @@ def _callback(monitor, dc, rect, data):
                 return 1
 
             monitors = []
-            callback = self.MONITORENUMPROC(_callback)
+            callback = self.monitorenumproc(_callback)
             windll.user32.EnumDisplayMonitors(0, 0, callback, 0)
             for mon in monitors:
                 yield mon
