openlp-core team mailing list archive

[Jon Tibble <meths@xxxxxxxxxxxxxx>]

Jon Tibble has proposed merging lp:~meths/openlp/trivialfixes into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)


Import fixes
-- 
https://code.launchpad.net/~meths/openlp/trivialfixes/+merge/29692
Your team OpenLP Core is requested to review the proposed merge of lp:~meths/openlp/trivialfixes into lp:openlp.

=== modified file 'openlp/plugins/presentations/lib/impresscontroller.py'
--- openlp/plugins/presentations/lib/impresscontroller.py	2010-07-11 20:53:53 +0000
+++ openlp/plugins/presentations/lib/impresscontroller.py	2010-07-12 12:14:40 +0000
@@ -37,8 +37,6 @@
 import os
 import time
 
-from openlp.core.lib import resize_image
-
 if os.name == u'nt':
     from win32com.client import Dispatch
     import pywintypes

=== modified file 'openlp/plugins/presentations/lib/mediaitem.py'
--- openlp/plugins/presentations/lib/mediaitem.py	2010-07-11 20:22:53 +0000
+++ openlp/plugins/presentations/lib/mediaitem.py	2010-07-12 12:14:40 +0000
@@ -30,7 +30,6 @@
 
 from openlp.core.lib import MediaManagerItem, BaseListWithDnD, build_icon, \
     SettingsManager, translate, check_item_selected
-from openlp.core.utils import AppLocation
 from openlp.plugins.presentations.lib import MessageListener
 
 log = logging.getLogger(__name__)