Skip to content

Commit

Permalink
Merge pull request #130 from luciferz2012/master
Browse files Browse the repository at this point in the history
fix for mouse deprecated msg
  • Loading branch information
glitchassassin authored Aug 31, 2018
2 parents a0697bc + 8b1fc85 commit 750b0a1
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 5 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ Be aware that **some Sikuli-script methods actually overwrite Python-native func

from lackey import *

username = input_("Enter your username: ")
username = input_("Enter your username: ") # built-in Python input

## Structure ##

Expand Down Expand Up @@ -101,4 +101,4 @@ Debugging contributions:

* [maxdule](https://github.com/maxdule)
* [nejch](https://github.com/nejch)
* [suvit](https://github.com/suvit)
* [suvit](https://github.com/suvit)
2 changes: 1 addition & 1 deletion lackey/InputEmulation.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import time

import keyboard
from keyboard import mouse
import mouse

# Python 3 compatibility
try:
Expand Down
2 changes: 1 addition & 1 deletion lackey/RegionMatching.py
Original file line number Diff line number Diff line change
Expand Up @@ -1354,7 +1354,7 @@ def findBest(self, pattern):
findFailedRetry = True
while findFailedRetry:
best_match = None
all_matches = self.findAll(*args)
all_matches = self.findAll(pattern)
for match in all_matches:
if best_match is None or best_match.getScore() < match.getScore():
best_match = match
Expand Down
3 changes: 2 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@ opencv-python
wheel
pyperclip
keyboard>=v0.9.13
twine
twine
mouse

0 comments on commit 750b0a1

Please sign in to comment.