nojhan/weboob-devel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

VirtKeyboard: make color argument mandatory

Browse source 
Signed-off-by: Pierre Mazière <pierre.maziere@gmail.com>
This commit is contained in:
Pierre Mazière 2011-11-04 10:08:33 +01:00
commit b14079a31e
1 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

23
weboob/tools/captcha/virtkeyboard.py
View file

@ -27,26 +27,31 @@ class VirtKeyboardError(Exception):
class VirtKeyboard(object):
def __init__(self, file,coords,color=None):
def __init__(self, file,coords,color):
# file: virtual keyboard image
# coords: dictionary <value to return>:<tuple(x1,y1,x2,y2)>
# color: color of the symbols in the image
# depending on the image, it can be a single value or a tuple
self.color=color
img=Image.open(file)
self.bands=img.getbands()
if isinstance(color,int) and not isinstance(self.bands,str) and len(self.bands)!=1:
raise VirtKeyboardError("Color requires %i component but only 1 is provided" \
% len(self.bands))
if not isinstance(color, int) and len(color)!=len(self.bands):
raise VirtKeyboardError("Color requires %i components but %i are provided" \
% (len(self.bands),len(color)))
self.color=color
(self.width,self.height)=img.size
self.pixar=img.load()
self.coords={}
self.md5={}
for i in coords.keys():
if self.color is None:
self.coords[i]=coords[i]
else:
coord=self.get_symbol_coords(coords[i])
if coord==(-1,-1,-1,-1):
continue
self.coords[i]=coord
coord=self.get_symbol_coords(coords[i])
if coord==(-1,-1,-1,-1):
continue
self.coords[i]=coord
self.md5[i]=self.checksum(self.coords[i])
def get_symbol_coords(self,(x1,y1,x2,y2)):