From f60c32db77d5fc06f87f87438245d737746bc6f3 Mon Sep 17 00:00:00 2001
From: Christophe Benz <christophe.benz@gmail.com>
Date: Sat, 10 Jul 2010 21:54:59 +0200
Subject: [PATCH] do not catch ImportError

---
 weboob/backends/youtube/backend.py |  7 ++---
 weboob/tools/storage.py            | 46 +++++++++++++++---------------
 2 files changed, 25 insertions(+), 28 deletions(-)

diff --git a/weboob/backends/youtube/backend.py b/weboob/backends/youtube/backend.py
index 9a2314d8..be86b7aa 100644
--- a/weboob/backends/youtube/backend.py
+++ b/weboob/backends/youtube/backend.py
@@ -16,6 +16,7 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
+import datetime
 import logging
 
 from weboob.core.backend import BaseBackend
@@ -43,11 +44,7 @@ class YoutubeBackend(BaseBackend, ICapVideo):
         return self.browser.get_video(_id)
 
     def iter_search_results(self, pattern=None, sortby=ICapVideo.SEARCH_RELEVANCE, nsfw=False):
-        try:
-            import gdata.youtube.service
-        except ImportError:
-            logging.error('Youtube backend search feature requires python-gdata package.')
-            return
+        import gdata.youtube.service
         yt_service = gdata.youtube.service.YouTubeService()
         query = gdata.youtube.service.YouTubeVideoQuery()
         query.orderby = ('relevance', 'rating', 'viewCount', 'published')[sortby]
diff --git a/weboob/tools/storage.py b/weboob/tools/storage.py
index feff972e..8969f361 100644
--- a/weboob/tools/storage.py
+++ b/weboob/tools/storage.py
@@ -15,9 +15,13 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
+
 from copy import deepcopy
 from logging import error
 
+from .config.yamlconfig import YamlConfig
+
+
 class IStorage:
     def load(self, what, name, default={}):
         raise NotImplementedError()
@@ -31,31 +35,27 @@ class IStorage:
     def get(self, what, name, *args, **kwargs):
         raise NotImplementedError()
 
-try:
-    from .config.yamlconfig import YamlConfig
-except ImportError, e:
-    error('Import error for weboob.tools.config.yamlconfig: %s' % e)
-else:
-    class StandardStorage(IStorage):
-        def __init__(self, path):
-            self.config = YamlConfig(path)
-            self.config.load()
 
-        def load(self, what, name, default={}):
-            d = {}
-            if not what in self.config.values:
-                self.config.values[what] = {}
-            else:
-                d = self.config.values[what].get(name, {})
+class StandardStorage(IStorage):
+    def __init__(self, path):
+        self.config = YamlConfig(path)
+        self.config.load()
 
-            self.config.values[what][name] = deepcopy(default)
-            self.config.values[what][name].update(d)
+    def load(self, what, name, default={}):
+        d = {}
+        if not what in self.config.values:
+            self.config.values[what] = {}
+        else:
+            d = self.config.values[what].get(name, {})
 
-        def save(self, what, name):
-            self.config.save()
+        self.config.values[what][name] = deepcopy(default)
+        self.config.values[what][name].update(d)
 
-        def set(self, what, name, *args):
-            self.config.set(what, name, *args)
+    def save(self, what, name):
+        self.config.save()
 
-        def get(self, what, name, *args, **kwargs):
-            return self.config.get(what, name, *args, **kwargs)
+    def set(self, what, name, *args):
+        self.config.set(what, name, *args)
+
+    def get(self, what, name, *args, **kwargs):
+        return self.config.get(what, name, *args, **kwargs)