From 60fdb86eef96db68f85d332a54f114add1b1c38e Mon Sep 17 00:00:00 2001
From: Christophe Benz <christophe.benz@gmail.com>
Date: Mon, 12 Jul 2010 19:38:02 +0200
Subject: [PATCH] add backward compatibility for _type

---
 weboob/core/backends.py | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/weboob/core/backends.py b/weboob/core/backends.py
index f6641a5d..5f738baf 100644
--- a/weboob/core/backends.py
+++ b/weboob/core/backends.py
@@ -110,10 +110,16 @@ class BackendsConfig(object):
         for instance_name in config.sections():
             params = dict(config.items(instance_name, raw=True))
             try:
-                yield instance_name, params.pop('backend'), params
+                backend_name = params.pop('_backend')
             except KeyError:
-                warning('Missing field "backend" for configured backend "%s"', instance_name)
-                continue
+                try:
+                    backend_name = params.pop('_type')
+                    logging.warning(u'Please replace _type with _backend in your config file "%s", for backend "%s"' % (
+                        self.confpath, backend_name))
+                except KeyError:
+                    warning('Missing field "_backend" for configured backend "%s"', instance_name)
+                    continue
+            yield instance_name, backend_name, params
 
     def add_backend(self, instance_name, backend_name, params, edit=False):
         if not instance_name:
@@ -122,7 +128,7 @@ class BackendsConfig(object):
         config.read(self.confpath)
         if not edit:
             config.add_section(instance_name)
-        config.set(instance_name, 'backend', backend_name)
+        config.set(instance_name, '_backend', backend_name)
         for key, value in params.iteritems():
             config.set(instance_name, key, value)
         with open(self.confpath, 'wb') as f:
@@ -138,11 +144,17 @@ class BackendsConfig(object):
             raise KeyError(u'Configured backend "%s" not found' % instance_name)
 
         items = dict(config.items(instance_name, raw=True))
+
         try:
-            return items.pop('backend'), items
+            backend_name = items.pop('_backend')
         except KeyError:
-            warning('Missing field "backend" for backend "%s"', instance_name)
-            raise KeyError(u'Configured backend "%s" not found' % instance_name)
+            try:
+                backend_name = items.pop('_type')
+                logging.warning(u'Please replace _type with _backend in your config file "%s"' % self.confpath)
+            except KeyError:
+                warning('Missing field "_backend" for configured backend "%s"', instance_name)
+                raise KeyError(u'Configured backend "%s" not found' % instance_name)
+        return backend_name, items
 
     def remove_backend(self, instance_name):
         config = SafeConfigParser()