OpenLP

Merge lp:~j-corwin/openlp/present into lp:openlp

  1. present
  2. Merge into trunk
Proposed by Jonathan Corwin
Status: Merged
Merged at revision: 1507
Proposed branch: lp:~j-corwin/openlp/present
Merge into: lp:openlp
Diff against target: 12 lines (+1/-1)
1 file modified
openlp/plugins/presentations/lib/mediaitem.py (+1/-1)
To merge this branch: bzr merge lp:~j-corwin/openlp/present
Reviewer Review Type Date Requested Status
Raoul Snyman Approve
Tim Bentley Approve
Review via email: mp+59591@code.launchpad.net

Description of the change

Although preventing users from importing presentations will make supporting it easier, apparently it's not a desirable feature. Remove the "." from the file extension!

To post a comment you must log in.
Revision history for this message
Tim Bentley (trb143) wrote :

Well it was better that the original code!

review: Approve
Revision history for this message
Raoul Snyman (raoul-snyman) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'openlp/plugins/presentations/lib/mediaitem.py'
--- openlp/plugins/presentations/lib/mediaitem.py 2011-04-29 22:29:53 +0000
+++ openlp/plugins/presentations/lib/mediaitem.py 2011-04-30 16:15:49 +0000
@@ -293,7 +293,7 @@
293 "supports" the extension. If none found, then look for a controller293 "supports" the extension. If none found, then look for a controller
294 which "also supports" it instead.294 which "also supports" it instead.
295 """295 """
296 filetype = os.path.splitext(filename)[1]296 filetype = os.path.splitext(filename)[1][1:]
297 if not filetype:297 if not filetype:
298 return None298 return None
299 for controller in self.controllers:299 for controller in self.controllers: