openlp-core team mailing list archive

[Tim Bentley <tim.bentley@xxxxxxxxx>]

Tim Bentley has proposed merging lp:~trb143/openlp/bug-855368 into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  Bug #855368 in OpenLP: "Get Traceback if adding any Video File to Service"
  https://bugs.launchpad.net/openlp/+bug/855368

For more details, see:
https://code.launchpad.net/~trb143/openlp/bug-855368/+merge/76458

change None to u'' for display
-- 
https://code.launchpad.net/~trb143/openlp/bug-855368/+merge/76458
Your team OpenLP Core is requested to review the proposed merge of lp:~trb143/openlp/bug-855368 into lp:openlp.

=== modified file 'openlp/core/lib/serviceitem.py'
--- openlp/core/lib/serviceitem.py	2011-09-02 19:04:07 +0000
+++ openlp/core/lib/serviceitem.py	2011-09-21 17:30:36 +0000
@@ -466,7 +466,7 @@
                 '<strong>Length</strong>: %s')) % \
                 unicode(datetime.timedelta(seconds=self.media_length))
         if not start and not end:
-            return None
+            return u''
         elif start and not end:
             return start
         elif not start and end: