Merge lp:~stefanor/ibid/tvshow-412447 into lp:~ibid-core/ibid/old-trunk-pack-0.92

[Stefano Rivera]

[Michael Gorven (mgorven)]

 review approve

review: Approve

[Jeremy Thurgood (jerith)]

Looks reasonable.

review: Approve

[Jonathan Hitchcock (vhata)]

review: Approve

=== modified file 'ibid/core.py'
--- ibid/core.py	2009-07-15 22:28:01 +0000
+++ ibid/core.py	2009-08-12 11:32:15 +0000
@@ -24,8 +24,12 @@
             try:
                 processor.process(event)
             except:
-                self.log.exception(u"Exception occured in %s processor of %s plugin",
-                        processor.__class__.__name__, processor.name)
+                self.log.exception(
+                        u'Exception occured in %s processor of %s plugin.\n'
+                        u'Event: %s',
+                        processor.__class__.__name__,
+                        processor.name,
+                        event)
                 event.complain = u'exception'
                 if 'session' in event:
                     event.session.rollback()
 
=== modified file 'ibid/plugins/lookup.py'
--- ibid/plugins/lookup.py	2009-08-08 14:02:08 +0000
+++ ibid/plugins/lookup.py	2009-08-12 11:12:01 +0000
@@ -797,12 +797,9 @@
 
         for field in ('Latest Episode', 'Next Episode'):
             if field in show_dict:
-                format_from = '%b/%d/%Y'
-                format_to = '%d %B %Y'
                 ep, name, date = show_dict[field].split('^', 2)
-                if date.count('/') < 2:
-                    format_from = '%b/%Y'
-                    format_to = '%B %Y'
+                format_from = '/'.join(('%b', '%d', '%Y')[-1 - date.count('/'):])
+                format_to = ' '.join(('%d', '%B', '%Y')[-1 - date.count('/'):])
                 date = strftime(format_to, strptime(date, format_from))
                 show_dict[field] = u'%s - "%s" - %s' % (ep, name, date)        
         return show_dict