From 1994970385fbac285e016d3998ae8ce526a385a4 Mon Sep 17 00:00:00 2001
From: Florent <weboob@flo.fourcot.fr>
Date: Tue, 1 Apr 2014 12:59:13 +0200
Subject: [PATCH] Simplify the code

---
 modules/ing/browser.py        |  2 +-
 modules/ing/pages/login.py    |  4 +---
 modules/ing/pages/transfer.py | 22 ++++++++--------------
 3 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/modules/ing/browser.py b/modules/ing/browser.py
index 6e3d2bd9..06c905ba 100644
--- a/modules/ing/browser.py
+++ b/modules/ing/browser.py
@@ -145,7 +145,7 @@ class IngBrowser(LoginBrowser):
     @need_login
     def get_recipients(self, account):
         self.transferpage.stay_or_go()
-        if self.page.ischecked(account):
+        if self.page.ischecked(account.id):
             return self.page.get_recipients()
         else:
             # It is hard to check the box and to get the real list.
diff --git a/modules/ing/pages/login.py b/modules/ing/pages/login.py
index c0220714..60d3b3b6 100644
--- a/modules/ing/pages/login.py
+++ b/modules/ing/pages/login.py
@@ -108,11 +108,9 @@ class LoginPage(HTMLPage):
             return False
         realpasswd = ""
         span = self.doc.find('//span[@id="digitpaddisplayLogin"]')
-        i = 0
-        for font in span.getiterator('font'):
+        for i, font in enumerate(span.getiterator('font')):
             if font.attrib.get('class') == "vide":
                 realpasswd += password[i]
-            i += 1
         self.browser.logger.debug('We are looking for : ' + realpasswd)
         self.browser.logger.debug("Coordonates: " + vk.get_string_code(realpasswd))
 
diff --git a/modules/ing/pages/transfer.py b/modules/ing/pages/transfer.py
index f287be97..47447d94 100644
--- a/modules/ing/pages/transfer.py
+++ b/modules/ing/pages/transfer.py
@@ -55,20 +55,15 @@ class TransferPage(LoggedPage, HTMLPage):
                 recipient._type = "ext"
                 yield recipient
 
-    def ischecked(self, account):
-        id = account.id
+    def ischecked(self, _id):
         # remove prefix (CC-, LA-, ...)
-        if "-" in id:
-            id = id.split('-')[1]
-        option = self.doc.xpath('//input[@value="%s"]' % id)
-        if len(option) == 0:
-            raise AccountNotFound()
-        else:
-            option = option[0]
+        if "-" in _id:
+            _id = _id.split('-')[1]
         try:
-            return option.attrib["checked"] == "checked"
+            option = self.doc.xpath('//input[@value="%s"]' % _id)[0]
         except:
-            return False
+            raise AccountNotFound()
+        return option.attrib.get("checked") == "checked"
 
     def transfer(self, recipient, amount, reason):
         form = self.get_form(name="transfer_form")
@@ -138,13 +133,12 @@ class TransferConfirmPage(HTMLPage):
         except VirtKeyboardError as err:
             error("Error: %s" % err)
             return
+
         realpasswd = ""
         span = self.doc.find('//span[@id="digitpadtransfer"]')
-        i = 0
-        for font in span.getiterator('font'):
+        for i, font in enumerate(span.getiterator('font')):
             if font.attrib.get('class') == "vide":
                 realpasswd += password[i]
-            i += 1
         self.browser.logger.debug('We are looking for : ' + realpasswd)
         coordinates = vk.get_string_code(realpasswd)
         self.browser.logger.debug("Coordonates: " + coordinates)