Merge pull request #14 from pculture/hotfix/http_errors

Hotfix/http errors

docs/conf.py

@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.5.1'
+version = '0.5.2'
 # The full version, including alpha/beta/rc tags.
-release = '0.5.1'
+release = '0.5.2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

setup.py

@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-version = '0.5.1'
+version = '0.5.2'
 
 setup(
     name="vidscraper",

vidscraper/__init__.py

@@ -28,7 +28,7 @@
 from vidscraper.suites import Video, registry, VideoSearch, VideoFeed
 
 
-__version__ = '0.5.1'
+__version__ = '0.5.2'
 
 
 def handles_video_url(url):

vidscraper/suites/base.py

@@ -205,6 +205,11 @@ def __init__(self, url, suite=None, fields=None, api_keys=None):
         # from a feed or a search.
         self._loaded = False
 
+        # This private attribute is filled with any errors that show up during
+        # data loading. The keys will be the methods, and the values will be
+        # the exceptions.
+        self._errors = {}
+
     @property
     def missing_fields(self):
         """
@@ -753,9 +758,12 @@ def _run_methods(self, video, methods):
             try:
                 response_text = urllib2.urlopen(url, timeout=5).read()
             except Exception, exc:
-                # if an exception is raised in this method, it isn't caught and
-                # shows up to the user
-                data = getattr(self, 'parse_%s_error' % method)(exc)
+                # If an error is raised, pass it on to the suite for handling.
+                # If it gets reraised, store it and go on to the next method.
+                try:
+                    data = getattr(self, 'parse_%s_error' % method)(exc)
+                except Exception, exc:
+                    video._errors[method] = exc
             else:
                 data = getattr(self, "parse_%s_response" % method)(response_text)
             self.apply_video_data(video, data)

vidscraper/tests/functional/test_auto.py

@@ -56,5 +56,6 @@ def test_auto_feed(self):
         self.assertEqual(
             feed.thumbnail_url,
             'http://www.youtube.com/img/pic_youtubelogo_123x63.gif')
-        self.assertTrue('AssociatedPress' in feed.webpage)
+        # YouTube changes this sometimes, so just make sure it's there
+        self.assertTrue(feed.webpage)
         self.assertTrue(feed.entry_count > 50000)

vidscraper/tests/functional/test_youtube.py

@@ -184,14 +184,14 @@ def test_feed(self):
             'url': u'http://gdata.youtube.com/feeds/base/users/AssociatedPress/uploads?alt=rss&v=2',
             'title': u'Uploads by AssociatedPress',
             'description': u'',
-            'webpage': u'http://www.youtube.com/user/AssociatedPress/videos',
             'thumbnail_url': u'http://www.youtube.com/img/pic_youtubelogo_123x63.gif',
             'guid': u'tag:youtube.com,2008:user:AssociatedPress:uploads',
             }
         for key, value in expected.items():
             self.assertEqual(value, getattr(feed, key), '%s: %r != %r' % (
                     key, value, getattr(feed, key)))
-
+        # YouTube changes this sometimes, so just make sure it's there
+        self.assertTrue(feed.webpage)
         self.assertTrue(feed.entry_count > 55000, feed.entry_count)
 
     def test_feed_18790(self):