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

add a parameter "convert"

Browse source
This commit is contained in:
Romain Bignon 2013-01-10 13:20:06 +01:00
commit 123eb4f32b
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -28,13 +28,17 @@ class VirtKeyboardError(Exception):
class VirtKeyboard(object): class VirtKeyboard(object):
def __init__(self, file, coords, color): def __init__(self, file, coords, color, convert=None):
# file: virtual keyboard image # file: virtual keyboard image
# coords: dictionary <value to return>:<tuple(x1,y1,x2,y2)> # coords: dictionary <value to return>:<tuple(x1,y1,x2,y2)>
# color: color of the symbols in the image # color: color of the symbols in the image
# depending on the image, it can be a single value or a tuple # depending on the image, it can be a single value or a tuple
# convert: if not None, convert image to this target type (for example 'RGB')
img = Image.open(file) img = Image.open(file)
if convert is not None:
img = img.convert(convert)
self.bands = img.getbands() self.bands = img.getbands()
if isinstance(color, int) and not isinstance(self.bands, str) and len(self.bands) != 1: 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" \ raise VirtKeyboardError("Color requires %i component but only 1 is provided" \
@ -128,7 +132,7 @@ class VirtKeyboard(object):
class MappedVirtKeyboard(VirtKeyboard): class MappedVirtKeyboard(VirtKeyboard):
def __init__(self, file, document, img_element, color, map_attr="onclick"): def __init__(self, file, document, img_element, color, map_attr="onclick", convert=None):
map_id = img_element.attrib.get("usemap")[1:] map_id = img_element.attrib.get("usemap")[1:]
map = document.find("//map[@id='" + map_id + "']") map = document.find("//map[@id='" + map_id + "']")
if map is None: if map is None:
@ -142,4 +146,4 @@ class MappedVirtKeyboard(VirtKeyboard):
area_coords.append(int(coord)) area_coords.append(int(coord))
coords[code] = tuple(area_coords) coords[code] = tuple(area_coords)
VirtKeyboard.__init__(self, file, coords, color) VirtKeyboard.__init__(self, file, coords, color, convert)