OpenLP

Merge lp:~raoul-snyman/openlp/bug-898876 into lp:openlp

  1. bug-898876
  2. Merge into trunk
Proposed by Raoul Snyman
Status: Merged
Approved by: Tim Bentley
Approved revision: 1811
Merged at revision: 1812
Proposed branch: lp:~raoul-snyman/openlp/bug-898876
Merge into: lp:openlp
Diff against target: 11 lines (+1/-0)
1 file modified
openlp/core/ui/slidecontroller.py (+1/-0)
To merge this branch: bzr merge lp:~raoul-snyman/openlp/bug-898876
Reviewer Review Type Date Requested Status
Tim Bentley Approve
Review via email: mp+84218@code.launchpad.net

Description of the change

Added a missing import.

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

Interesting that Meths and I had code checkers that said this can be removed!

review: Approve
Revision history for this message
Tim Bentley (trb143) wrote :

can you double check this is still needed after the media re-write stuff went in!

Revision history for this message
rimach (crichter) wrote :

> can you double check this is still needed after the media re-write stuff went
> in!
yes it is

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

Tim, I specifically merged the media_rewrite branch before I did this, just to check if it didn't fix it.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'openlp/core/ui/slidecontroller.py'
2--- openlp/core/ui/slidecontroller.py 2011-12-02 06:56:57 +0000
3+++ openlp/core/ui/slidecontroller.py 2011-12-02 07:05:30 +0000
4@@ -25,6 +25,7 @@
5 # Temple Place, Suite 330, Boston, MA 02111-1307 USA #
6 ###############################################################################
7
8+import os
9 import logging
10 import time
11 import copy