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

MappedVirtKeyboard: set <map> attribute to return

Browse source 
Rather than imposing onclick, the map attribute whose value is returned
when retrieving a code is now a constructor argument
For the sake of backward compatibility, default is set to onclick

Signed-off-by: Pierre Mazière <pierre.maziere@gmail.com>
This commit is contained in:
Pierre Mazière 2012-01-24 22:31:00 +01:00 • committed by Romain Bignon
commit 2310e8506f
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -123,7 +123,9 @@ class VirtKeyboard(object):
img.save(dir+"/"+self.md5[i]+".png") img.save(dir+"/"+self.md5[i]+".png")
class MappedVirtKeyboard(VirtKeyboard): class MappedVirtKeyboard(VirtKeyboard):
def __init__(self,file,document,img_element,color): def __init__(self,file,document,img_element,color,map_attr):
if map_attr is None: # for backward compatibility
map_attr="onclick"
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:
@ -131,7 +133,7 @@ class MappedVirtKeyboard(VirtKeyboard):
coords={} coords={}
for area in map.getiterator("area"): for area in map.getiterator("area"):
code=area.attrib.get("onclick") code=area.attrib.get(map_attr)
area_coords=[] area_coords=[]
for coord in area.attrib.get("coords").split(','): for coord in area.attrib.get("coords").split(','):
area_coords.append(int(coord)) area_coords.append(int(coord))