From 38a3de1ef9b05ccfd8cae5900c7231bc82aebc00 Mon Sep 17 00:00:00 2001
From: Romain Bignon <romain@symlink.me>
Date: Sat, 20 Dec 2014 16:20:03 +0100
Subject: [PATCH] fix API to store optimization name in object ID

---
 weboob/applications/havedate/havedate.py | 14 +++++++-------
 weboob/capabilities/dating.py            |  3 ++-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/weboob/applications/havedate/havedate.py b/weboob/applications/havedate/havedate.py
index 8a4fa841..4915c3fc 100644
--- a/weboob/applications/havedate/havedate.py
+++ b/weboob/applications/havedate/havedate.py
@@ -183,8 +183,8 @@ class HaveDate(Boobmsg):
             else:
                 backend = args[2]
             optims = set()
-            for (name, optim) in self.do('iter_optimizations', backends=backend):
-                optims.add(name)
+            for optim in self.do('iter_optimizations', backends=backend):
+                optims.add(optim.id)
             return sorted(optims - set(args[3:]))
 
     def do_optim(self, line):
@@ -222,17 +222,17 @@ class HaveDate(Boobmsg):
 
             optims = {}
             backends = set()
-            for (name, optim) in self.do('iter_optimizations', backends=backend_name):
-                if optims_names is not None and name not in optims_names:
+            for optim in self.do('iter_optimizations', backends=backend_name):
+                if optims_names is not None and optim.id not in optims_names:
                     continue
                 if optim.is_running():
                     status = 'RUNNING'
                 else:
                     status = '-------'
-                if name not in optims:
-                    optims[name] = {optim.backend: status}
+                if optim.id not in optims:
+                    optims[optim.id] = {optim.backend: status}
                 else:
-                    optims[name][optim.backend] = status
+                    optims[optim.id][optim.backend] = status
                 backends.add(optim.backend)
 
             backends = sorted(backends)
diff --git a/weboob/capabilities/dating.py b/weboob/capabilities/dating.py
index 0117ac7d..562f6d51 100644
--- a/weboob/capabilities/dating.py
+++ b/weboob/capabilities/dating.py
@@ -110,6 +110,7 @@ class CapDating(Capability):
         :param optim: optimization
         :type optim: :class:`Optimization`
         """
+        optim.id = name
         setattr(self, 'OPTIM_%s' % name, optim)
 
     def iter_optimizations(self):
@@ -125,7 +126,7 @@ class CapDating(Capability):
             if attr is None:
                 continue
 
-            yield attr_name[6:], attr
+            yield attr
 
     def get_optimization(self, optim):
         """