Merge pull request #37 from glitchassassin/develop

v0.5.0

README.md

@@ -104,4 +104,10 @@ To build the wheel from source, run:
 
     python setup.py bdist_wheel
 
-(Note that you may need to make sure `wheel` is installed)
+(Note that you may need to make sure `wheel` is installed)
+
+## Special thanks ##
+
+Debugging contributions:
+
+* [maxdule](https://github.com/maxdule)

docs/source/conf.py

@@ -20,6 +20,7 @@
 import sys
 path = os.path.abspath('../..')
 sys.path.insert(0, path)
+from lackey import __version__
 try:
     #py3 import
     from unittest.mock import MagicMock
@@ -78,9 +79,9 @@ def __getattr__(cls, name):
 # built documents.
 #
 # The short X.Y version.
-version = u'0.4'
+version = __version__
 # The full version, including alpha/beta/rc tags.
-release = u'0.4.2a1'
+release = __version__
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

lackey/Exceptions.py

@@ -1,3 +1,6 @@
+""" Custom exceptions for Sikuli script """
+
 class FindFailed(Exception):
-	def __init__(self,*args,**kwargs):
-		Exception.__init__(self,*args,**kwargs)
+    """ Exception: Unable to find the searched item """
+    def __init__(self, *args, **kwargs):
+        Exception.__init__(self, *args, **kwargs)

lackey/KeyCodes.py

@@ -1,68 +1,70 @@
 class Button():
-	LEFT = 0
-	CENTER = 1
-	RIGHT = 2
+    LEFT = 0
+    CENTER = 1
+    RIGHT = 2
 
 class Key():
-	""" Key codes for PlatformManager.TypeKeys() function. Can be entered directly or concatenated with an existing string. """
-	ENTER 		= "{ENTER}"
-	ESC 		= "{ESC}"
-	BACKSPACE 	= "{BACKSPACE}"
-	DELETE 		= "{DELETE}"
-	F1 			= "{F1}"
-	F2 			= "{F2}"
-	F3 			= "{F3}"
-	F4 			= "{F4}"
-	F5 			= "{F5}"
-	F6 			= "{F6}"
-	F7 			= "{F7}"
-	F8 			= "{F8}"
-	F9 			= "{F9}"
-	F10 		= "{F10}"
-	F11 		= "{F11}"
-	F12 		= "{F12}"
-	F13 		= "{F13}"
-	F14 		= "{F14}"
-	F15 		= "{F15}"
-	F16 		= "{F16}"
-	HOME 		= "{HOME}"
-	END 		= "{END}"
-	LEFT 		= "{LEFT}"
-	RIGHT 		= "{RIGHT}"
-	DOWN 		= "{DOWN}"
-	UP 			= "{UP}"
-	PAGE_DOWN 	= "{PAGE_DOWN}"
-	PAGE_UP 	= "{PAGE_UP}"
-	TAB			= "{TAB}"
-	CAPS_LOCK 	= "{CAPS_LOCK}"
-	NUM_LOCK	= "{NUM_LOCK}"
-	SCROLL_LOCK	= "{SCROLL_LOCK}"
-	INSERT		= "{INSERT}"
-	SPACE		= "{SPACE}"
-	PRINTSCREEN = "{PRTSC}"
-	ALT 		= "{ALT}"
-	CMD 		= "{CMD}"
-	CONTROL 	= "{CTRL}"
-	META 		= "{META}"
-	SHIFT 		= "{SHIFT}"
-	WIN 		= "{WIN}"
-	PAUSE		= "{PAUSE}"
-	NUM_0		= "{NUM_0}"
-	NUM_1		= "{NUM_1}"
-	NUM_2		= "{NUM_2}"
-	NUM_3		= "{NUM_3}"
-	NUM_4		= "{NUM_4}"
-	NUM_5		= "{NUM_5}"
-	NUM_6		= "{NUM_6}"
-	NUM_7		= "{NUM_7}"
-	NUM_8		= "{NUM_8}"
-	NUM_9		= "{NUM_9}"
+    """ Key codes for PlatformManager.TypeKeys() function.
+
+    Can be entered directly or concatenated with an existing string. """
+    ENTER 		= "{ENTER}"
+    ESC 		= "{ESC}"
+    BACKSPACE 	= "{BACKSPACE}"
+    DELETE 		= "{DELETE}"
+    F1 			= "{F1}"
+    F2 			= "{F2}"
+    F3 			= "{F3}"
+    F4 			= "{F4}"
+    F5 			= "{F5}"
+    F6 			= "{F6}"
+    F7 			= "{F7}"
+    F8 			= "{F8}"
+    F9 			= "{F9}"
+    F10 		= "{F10}"
+    F11 		= "{F11}"
+    F12 		= "{F12}"
+    F13 		= "{F13}"
+    F14 		= "{F14}"
+    F15 		= "{F15}"
+    F16 		= "{F16}"
+    HOME 		= "{HOME}"
+    END 		= "{END}"
+    LEFT 		= "{LEFT}"
+    RIGHT 		= "{RIGHT}"
+    DOWN 		= "{DOWN}"
+    UP 			= "{UP}"
+    PAGE_DOWN 	= "{PGDN}"
+    PAGE_UP 	= "{PGUP}"
+    TAB			= "{TAB}"
+    CAPS_LOCK 	= "{CAPS_LOCK}"
+    NUM_LOCK	= "{NUM_LOCK}"
+    SCROLL_LOCK	= "{SCROLL_LOCK}"
+    INSERT		= "{INSERT}"
+    SPACE		= "{SPACE}"
+    PRINTSCREEN = "{PRTSC}"
+    ALT 		= "{ALT}"
+    CMD 		= "{CMD}"
+    CONTROL 	= "{CTRL}"
+    META 		= "{META}"
+    SHIFT 		= "{SHIFT}"
+    WIN 		= "{WIN}"
+    PAUSE		= "{PAUSE}"
+    NUM_0		= "{NUM_0}"
+    NUM_1		= "{NUM_1}"
+    NUM_2		= "{NUM_2}"
+    NUM_3		= "{NUM_3}"
+    NUM_4		= "{NUM_4}"
+    NUM_5		= "{NUM_5}"
+    NUM_6		= "{NUM_6}"
+    NUM_7		= "{NUM_7}"
+    NUM_8		= "{NUM_8}"
+    NUM_9		= "{NUM_9}"
 
 class KeyModifier():
-	""" Key modifiers precede either a single key [e.g., ^v] or a set of characters within parentheses [e.g., +(hello)] """
-	CTRL 		= "^"
-	SHIFT 		= "+"
-	ALT 		= "%"
-	META 		= "@"
-	CMD 		= "@"
-	WIN 		= "@"
+    """ Key modifiers precede either a single key [e.g., ^v] or a set of characters within parentheses [e.g., +(hello)] """
+    CTRL 		= "{CTRL}"
+    SHIFT 		= "{SHIFT}"
+    ALT 		= "{ALT}"
+    META 		= "{WIN}"
+    CMD 		= "{WIN}"
+    WIN 		= "{WIN}"