Merge branch 'develop'

NEWS.rst

@@ -1,10 +1,17 @@
 News
 ====
 
+0.5.1
+-----
+**release date:** 2012-03-25
+
+* Improve error handling of enzyme parsing
+
 0.5
 ---
 **release date:** 2012-03-25
 **WARNING:** Backward incompatible changes
+
 * Use more unicode
 * New list_subtitles and download_subtitles methods
 * New Pool object for asynchronous work
@@ -17,12 +24,14 @@ News
 0.4
 ---
 **release date:** 2011-11-11
+
 * Many fixes
 * Better error handling
 
 0.3
 ---
 **release date:** 2011-08-18
+
 * Fix a bug when series is not guessed by guessit
 * Fix dependencies failure when installing package
 * Fix encoding issues with logging
@@ -33,6 +42,7 @@ News
 0.2
 ---
 **release date:** 2011-07-11
+
 * Fix plugin configuration
 * Fix some encoding issues
 * Remove extra logging
@@ -40,4 +50,5 @@ News
 0.1
 ---
 **release date:** not released yet
+
 * Initial release

subliminal/infos.py

@@ -15,4 +15,4 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with subliminal.  If not, see <http://www.gnu.org/licenses/>.
-__version__ = '0.5'
+__version__ = '0.5.1'

subliminal/videos.py

@@ -126,7 +126,7 @@ class Video(object):
         try:
             video_infos = enzyme.parse(self.path)
             logger.debug(u'Succeeded parsing %s with enzyme: %r' % (self.path, video_infos))
-        except enzyme.ParseError:
+        except:
             logger.debug(u'Failed parsing %s with enzyme' % self.path)
         if isinstance(video_infos, enzyme.core.AVContainer):
             results.extend([subtitles.EmbeddedSubtitle.from_enzyme(self.path, s) for s in video_infos.subtitles])