[mousetrap/gnome3-wip: 53/240] Reintroduce pylint and clean up code.



commit 37bd6c4f353f2eb640d7e3778ee370d96ac73674
Author: Stoney Jackson <dr stoney gmail com>
Date:   Tue May 20 21:43:07 2014 -0400

    Reintroduce pylint and clean up code.
    
    Pylint doesn't do well with test files. So just skip them.

 bin/mt-pylint                |    5 +++++
 src/mousetrap/mouse.py       |   20 ++++++++------------
 src/mousetrap/test_camera.py |    2 ++
 src/mousetrap/test_mouse.py  |    5 ++++-
 4 files changed, 19 insertions(+), 13 deletions(-)
---
diff --git a/bin/mt-pylint b/bin/mt-pylint
new file mode 100755
index 0000000..7957fac
--- /dev/null
+++ b/bin/mt-pylint
@@ -0,0 +1,5 @@
+#!/bin/env bash
+source "$(dirname "$0")/mt-define-mousetrap-home"
+pylint \
+    --reports=n \
+    "$MOUSETRAP_HOME/src/mousetrap"
diff --git a/src/mousetrap/mouse.py b/src/mousetrap/mouse.py
index 8b23ef1..1011ec5 100644
--- a/src/mousetrap/mouse.py
+++ b/src/mousetrap/mouse.py
@@ -1,23 +1,19 @@
 from gi.repository import Gdk
 
 
-class Mouse:
-    def __init__(self):
-        self._pointer = None
-        self._screen = None
+class Mouse(object):
 
+    def __init__(self):
         gdk_display = Gdk.Display.get_default()
-        self._screen = gdk_display.get_default_screen()
-
         device_manager = gdk_display.get_device_manager()
         self._pointer = device_manager.get_client_pointer()
+        self._screen = gdk_display.get_default_screen()
 
     def get_position(self):
-        X_INDEX = 1
-        Y_INDEX = 2
+        x_index = 1
+        y_index = 2
         position = self._pointer.get_position()
-        return (position[X_INDEX], position[Y_INDEX])
-
-    def set_position(self, x, y):
-        self._pointer.warp(self._screen, x, y)
+        return (position[x_index], position[y_index])
 
+    def set_position(self, point):
+        self._pointer.warp(self._screen, point[0], point[1])
diff --git a/src/mousetrap/test_camera.py b/src/mousetrap/test_camera.py
index e576ae2..7077935 100644
--- a/src/mousetrap/test_camera.py
+++ b/src/mousetrap/test_camera.py
@@ -1,3 +1,5 @@
+# pylint: skip-file
+
 import unittest
 from mousetrap.camera import Camera, CameraError
 
diff --git a/src/mousetrap/test_mouse.py b/src/mousetrap/test_mouse.py
index d1bf5dc..0c990ad 100644
--- a/src/mousetrap/test_mouse.py
+++ b/src/mousetrap/test_mouse.py
@@ -1,3 +1,5 @@
+# pylint: skip-file
+
 import unittest
 from mousetrap.mouse import Mouse
 
@@ -8,6 +10,7 @@ class test_mouse(unittest.TestCase):
         self.mouse = Mouse()
 
     def test_get_position(self):
+        # pylint: disable=unused-variable
         x, y = self.mouse.get_position()
         try:
             x += 1
@@ -16,7 +19,7 @@ class test_mouse(unittest.TestCase):
             self.assertTrue(False, msg='x or y is not a number')
 
     def test_set_position(self):
-        self.mouse.set_position(3, 4)
+        self.mouse.set_position((3, 4))
         x, y = self.mouse.get_position()
         self.assertEquals(3, x)
         self.assertEquals(4, y)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]