OpenLP

Merge lp:~meths/openlp/trivialfixes into lp:openlp

  1. trivialfixes
  2. Merge into trunk
Proposed by Jon Tibble
Status: Merged
Merged at revision: not available
Proposed branch: lp:~meths/openlp/trivialfixes
Merge into: lp:openlp
Diff against target: 1423 lines
79 files modified
cnvdb.py (+0/-1)
demo.py (+1/-1)
documentation/source/conf.py (+2/-1)
openlp/core/lib/baselistwithdnd.py (+0/-3)
openlp/core/lib/dockwidget.py (+1/-2)
openlp/core/lib/renderer.py (+0/-2)
openlp/core/lib/rendermanager.py (+0/-3)
openlp/core/lib/serviceitem.py (+1/-2)
openlp/core/lib/settingstab.py (+1/-1)
openlp/core/lib/themexmlhandler.py (+1/-1)
openlp/core/lib/xmlrootclass.py (+1/-2)
openlp/core/test/test_mediamanageritem.py (+10/-7)
openlp/core/test/test_plugin_manager.py (+5/-5)
openlp/core/test/test_render.py (+1/-1)
openlp/core/test/test_render_theme.py (+0/-1)
openlp/core/theme/theme.py (+1/-2)
openlp/core/ui/__init__.py (+3/-3)
openlp/core/ui/amendthemeform.py (+1/-2)
openlp/core/ui/maindisplay.py (+1/-2)
openlp/core/ui/mainwindow.py (+2/-4)
openlp/core/ui/servicemanager.py (+1/-5)
openlp/core/ui/settingsform.py (+1/-2)
openlp/core/ui/slidecontroller.py (+1/-3)
openlp/core/ui/test/test_service_manager.py (+5/-7)
openlp/core/ui/thememanager.py (+3/-4)
openlp/core/utils/registry.py (+1/-1)
openlp/migration/migratebibles.py (+0/-2)
openlp/migration/migratesongs.py (+5/-7)
openlp/plugins/audit/lib/audittab.py (+2/-2)
openlp/plugins/audit/lib/manager.py (+2/-7)
openlp/plugins/audit/lib/meta.py (+0/-1)
openlp/plugins/audit/lib/models.py (+2/-2)
openlp/plugins/audit/lib/tables.py (+1/-1)
openlp/plugins/bibles/forms/bibleimportform.py (+1/-4)
openlp/plugins/bibles/lib/bibleCSVimpl.py (+0/-2)
openlp/plugins/bibles/lib/bibleDBimpl.py (+0/-1)
openlp/plugins/bibles/lib/bibleHTTPimpl.py (+1/-5)
openlp/plugins/bibles/lib/bibleOSISimpl.py (+0/-1)
openlp/plugins/bibles/lib/biblestab.py (+1/-1)
openlp/plugins/bibles/lib/common.py (+0/-3)
openlp/plugins/bibles/lib/manager.py (+0/-3)
openlp/plugins/bibles/lib/mediaitem.py (+2/-2)
openlp/plugins/bibles/lib/models.py (+0/-1)
openlp/plugins/bibles/test/test_bibleManager.py (+8/-11)
openlp/plugins/bibles/test/test_bibleManagerAPI.py (+8/-11)
openlp/plugins/bibles/test/test_bibleManagerCSV.py (+8/-11)
openlp/plugins/bibles/test/test_bibleManagerOSIS.py (+8/-11)
openlp/plugins/custom/customplugin.py (+1/-1)
openlp/plugins/custom/forms/editcustomform.py (+1/-1)
openlp/plugins/custom/lib/manager.py (+3/-8)
openlp/plugins/custom/lib/mediaitem.py (+1/-2)
openlp/plugins/custom/lib/meta.py (+0/-1)
openlp/plugins/custom/lib/models.py (+2/-2)
openlp/plugins/custom/lib/tables.py (+1/-1)
openlp/plugins/images/imageplugin.py (+1/-1)
openlp/plugins/images/lib/imagetab.py (+1/-1)
openlp/plugins/images/lib/mediaitem.py (+1/-2)
openlp/plugins/media/lib/mediaitem.py (+1/-5)
openlp/plugins/media/mediaplugin.py (+3/-4)
openlp/plugins/presentations/lib/impresscontroller.py (+1/-4)
openlp/plugins/presentations/lib/mediaitem.py (+2/-2)
openlp/plugins/presentations/lib/messagelistener.py (+1/-1)
openlp/plugins/presentations/lib/pptviewcontroller.py (+1/-6)
openlp/plugins/presentations/lib/presentationtab.py (+2/-2)
openlp/plugins/presentations/presentationplugin.py (+1/-3)
openlp/plugins/remotes/lib/remotetab.py (+2/-2)
openlp/plugins/remotes/remoteplugin.py (+1/-2)
openlp/plugins/songs/forms/editsongform.py (+2/-3)
openlp/plugins/songs/forms/editverseform.py (+1/-1)
openlp/plugins/songs/forms/songbookform.py (+2/-1)
openlp/plugins/songs/forms/topicsform.py (+2/-1)
openlp/plugins/songs/lib/manager.py (+3/-7)
openlp/plugins/songs/lib/mediaitem.py (+2/-3)
openlp/plugins/songs/lib/meta.py (+0/-1)
openlp/plugins/songs/lib/models.py (+1/-1)
openlp/plugins/songs/lib/songstab.py (+0/-2)
openlp/plugins/songs/songsplugin.py (+1/-1)
openlp/plugins/songs/test/test_song_verse.py (+1/-1)
openlpcnv.pyw (+0/-2)
To merge this branch: bzr merge lp:~meths/openlp/trivialfixes
Reviewer Review Type Date Requested Status
Raoul Snyman Approve
Tim Bentley Pending
Review via email: mp+12419@code.launchpad.net

This proposal supersedes a proposal from 2009-09-25.

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

Approved

review: Approve
Revision history for this message
Raoul Snyman (raoul-snyman) :
review: Approve
lp:~meths/openlp/trivialfixes updated
570. By Jon Tibble

PPTViewer fixes

571. By Jon Tibble

Imports clean up

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'cnvdb.py'
2--- cnvdb.py 2009-09-08 19:58:05 +0000
3+++ cnvdb.py 2009-09-25 14:20:28 +0000
4@@ -25,7 +25,6 @@
5
6 import codecs
7 import sys
8-import chardet
9
10 def convert_file(inname, outname):
11 """
12
13=== modified file 'demo.py'
14--- demo.py 2009-09-08 19:58:05 +0000
15+++ demo.py 2009-09-25 14:20:28 +0000
16@@ -25,7 +25,7 @@
17 import sys
18 import time
19
20-from PyQt4 import QtGui, QtCore
21+from PyQt4 import QtGui
22
23 from openlp.core import Renderer
24 from openlp.theme import Theme
25
26=== modified file 'documentation/source/conf.py'
27--- documentation/source/conf.py 2009-09-03 21:41:34 +0000
28+++ documentation/source/conf.py 2009-09-25 14:20:28 +0000
29@@ -11,7 +11,8 @@
30 # All configuration values have a default; values that are commented out
31 # serve to show the default.
32
33-import sys, os
34+import os
35+import sys
36
37 # If extensions (or modules to document with autodoc) are in another directory,
38 # add these directories to sys.path here. If the directory is relative to the
39
40=== modified file 'openlp/core/lib/baselistwithdnd.py'
41--- openlp/core/lib/baselistwithdnd.py 2009-09-12 17:24:16 +0000
42+++ openlp/core/lib/baselistwithdnd.py 2009-09-25 14:20:28 +0000
43@@ -22,12 +22,9 @@
44 # Temple Place, Suite 330, Boston, MA 02111-1307 USA #
45 ###############################################################################
46
47-import types
48-
49 from PyQt4 import QtCore, QtGui
50
51 from openlp.core.lib.toolbar import *
52-from openlp.core.lib import translate
53
54 class BaseListWithDnD(QtGui.QListWidget):
55 """
56
57=== modified file 'openlp/core/lib/dockwidget.py'
58--- openlp/core/lib/dockwidget.py 2009-09-19 11:25:01 +0000
59+++ openlp/core/lib/dockwidget.py 2009-09-25 14:20:28 +0000
60@@ -22,10 +22,9 @@
61 # Temple Place, Suite 330, Boston, MA 02111-1307 USA #
62 ###############################################################################
63
64-import types
65 import logging
66
67-from PyQt4 import QtCore, QtGui
68+from PyQt4 import QtGui
69
70 class OpenLPDockWidget(QtGui.QDockWidget):
71 """
72
73=== modified file 'openlp/core/lib/renderer.py'
74--- openlp/core/lib/renderer.py 2009-09-21 23:11:50 +0000
75+++ openlp/core/lib/renderer.py 2009-09-25 14:20:28 +0000
76@@ -23,8 +23,6 @@
77 ###############################################################################
78
79 import logging
80-import os
81-import sys
82
83 from PyQt4 import QtGui, QtCore
84
85
86=== modified file 'openlp/core/lib/rendermanager.py'
87--- openlp/core/lib/rendermanager.py 2009-09-21 23:11:50 +0000
88+++ openlp/core/lib/rendermanager.py 2009-09-25 14:20:28 +0000
89@@ -23,9 +23,6 @@
90 ###############################################################################
91
92 import logging
93-import os
94-import sys
95-import linecache
96
97 from PyQt4 import QtGui, QtCore
98
99
100=== modified file 'openlp/core/lib/serviceitem.py'
101--- openlp/core/lib/serviceitem.py 2009-09-21 23:11:50 +0000
102+++ openlp/core/lib/serviceitem.py 2009-09-25 14:20:28 +0000
103@@ -24,9 +24,8 @@
104
105 import logging
106 import os
107-import time
108
109-from PyQt4 import QtCore, QtGui
110+from PyQt4 import QtGui
111
112 from openlp.core.lib import buildIcon
113
114
115=== modified file 'openlp/core/lib/settingstab.py'
116--- openlp/core/lib/settingstab.py 2009-09-08 19:58:05 +0000
117+++ openlp/core/lib/settingstab.py 2009-09-25 14:20:28 +0000
118@@ -22,7 +22,7 @@
119 # Temple Place, Suite 330, Boston, MA 02111-1307 USA #
120 ###############################################################################
121
122-from PyQt4 import QtCore, QtGui
123+from PyQt4 import QtGui
124
125 from openlp.core.lib import PluginConfig
126
127
128=== modified file 'openlp/core/lib/themexmlhandler.py'
129--- openlp/core/lib/themexmlhandler.py 2009-09-08 19:58:05 +0000
130+++ openlp/core/lib/themexmlhandler.py 2009-09-25 14:20:28 +0000
131@@ -25,7 +25,7 @@
132 import os
133
134 from xml.dom.minidom import Document
135-from xml.etree.ElementTree import ElementTree, XML, dump
136+from xml.etree.ElementTree import ElementTree, XML
137
138 from openlp.core.lib import str_to_bool
139
140
141=== modified file 'openlp/core/lib/xmlrootclass.py'
142--- openlp/core/lib/xmlrootclass.py 2009-09-08 19:58:05 +0000
143+++ openlp/core/lib/xmlrootclass.py 2009-09-25 14:20:28 +0000
144@@ -22,9 +22,8 @@
145 # Temple Place, Suite 330, Boston, MA 02111-1307 USA #
146 ###############################################################################
147
148-import platform
149+import os
150 import sys
151-import os
152 from types import StringType, NoneType, UnicodeType
153
154 from xml.etree.ElementTree import ElementTree, XML
155
156=== modified file 'openlp/core/test/test_mediamanageritem.py'
157--- openlp/core/test/test_mediamanageritem.py 2009-09-03 15:19:30 +0000
158+++ openlp/core/test/test_mediamanageritem.py 2009-09-25 14:20:28 +0000
159@@ -1,5 +1,11 @@
160+import logging
161+import os
162+import sys
163+
164 from PyQt4 import QtCore, QtGui
165-import logging
166+
167+from openlp.core.lib import MediaManagerItem
168+
169 logging.basicConfig(level=logging.DEBUG,
170 format='%(asctime)s %(name)-30s %(levelname)-8s %(message)s',
171 datefmt='%m-%d %H:%M',
172@@ -12,14 +18,11 @@
173 # tell the handler to use this format
174 console.setFormatter(formatter)
175 logging.getLogger(u'').addHandler(console)
176-log=logging.getLogger(u'')
177-
178+log = logging.getLogger(u'')
179 logging.info(u'Logging started')
180-import os, sys
181-mypath=os.path.split(os.path.abspath(__file__))[0]
182-
183+mypath = os.path.split(os.path.abspath(__file__))[0]
184 sys.path.insert(0,(os.path.join(mypath, '..' ,'..', '..')))
185-from openlp.core.lib import MediaManagerItem
186+
187 class TestMediaManager:
188 def setup_class(self):
189 self.app = QtGui.QApplication([])
190
191=== modified file 'openlp/core/test/test_plugin_manager.py'
192--- openlp/core/test/test_plugin_manager.py 2009-09-06 13:57:32 +0000
193+++ openlp/core/test/test_plugin_manager.py 2009-09-25 14:20:28 +0000
194@@ -1,5 +1,7 @@
195 import logging
196-import os, sys
197+import os
198+import sys
199+
200 from openlp.core.lib.pluginmanager import PluginManager
201
202 logging.basicConfig(level=logging.DEBUG,
203@@ -14,11 +16,9 @@
204 # tell the handler to use this format
205 console.setFormatter(formatter)
206 logging.getLogger(u'').addHandler(console)
207-log=logging.getLogger(u'')
208-
209+log = logging.getLogger(u'')
210 logging.info(u'Logging started')
211-mypath=os.path.split(os.path.abspath(__file__))[0]
212-
213+mypath = os.path.split(os.path.abspath(__file__))[0]
214 sys.path.insert(0,(os.path.join(mypath, '..' ,'..', '..')))
215
216 # test the plugin manager with some plugins in the test_plugins directory
217
218=== modified file 'openlp/core/test/test_render.py'
219--- openlp/core/test/test_render.py 2009-09-06 15:26:02 +0000
220+++ openlp/core/test/test_render.py 2009-09-25 14:20:28 +0000
221@@ -16,9 +16,9 @@
222 Place, Suite 330, Boston, MA 02111-1307 USA
223 """
224
225-import time
226 import sys
227 import os, os.path
228+
229 from PyQt4 import QtGui, QtCore
230
231 from openlp.core.theme import Theme
232
233=== modified file 'openlp/core/test/test_render_theme.py'
234--- openlp/core/test/test_render_theme.py 2009-09-06 15:26:02 +0000
235+++ openlp/core/test/test_render_theme.py 2009-09-25 14:20:28 +0000
236@@ -21,7 +21,6 @@
237 from PyQt4 import QtGui, QtCore
238
239 from openlp.core.theme import Theme
240-from openlp.core import Renderer
241 from test_render import TestRender_base, whoami
242
243 pypath = os.path.split(os.path.abspath(__file__))[0]
244
245=== modified file 'openlp/core/theme/theme.py'
246--- openlp/core/theme/theme.py 2009-09-08 19:58:05 +0000
247+++ openlp/core/theme/theme.py 2009-09-25 14:20:28 +0000
248@@ -22,10 +22,9 @@
249 # Temple Place, Suite 330, Boston, MA 02111-1307 USA #
250 ###############################################################################
251
252-import platform
253 import types
254+
255 from xml.etree.ElementTree import ElementTree, XML
256-
257 from PyQt4 import QtGui
258
259 DelphiColors={"clRed":0xFF0000,
260
261=== modified file 'openlp/core/ui/__init__.py'
262--- openlp/core/ui/__init__.py 2009-09-21 17:56:36 +0000
263+++ openlp/core/ui/__init__.py 2009-09-25 14:20:28 +0000
264@@ -38,6 +38,6 @@
265 from thememanager import ThemeManager
266 from mainwindow import MainWindow
267
268-__all__ = ['SplashScreen', 'AboutForm', 'SettingsForm', 'MasterToolbar',
269- 'MainWindow', 'MainDisplay', 'SlideController', 'ServiceManager',
270- 'ThemeManager', 'AmendThemeForm']
271+__all__ = ['SplashScreen', 'AboutForm', 'SettingsForm', 'MainWindow',
272+ 'MainDisplay', 'SlideController', 'ServiceManager', 'ThemeManager',
273+ 'AmendThemeForm']
274
275=== modified file 'openlp/core/ui/amendthemeform.py'
276--- openlp/core/ui/amendthemeform.py 2009-09-24 01:37:21 +0000
277+++ openlp/core/ui/amendthemeform.py 2009-09-25 14:20:28 +0000
278@@ -26,9 +26,8 @@
279 import os, os.path
280
281 from PyQt4 import QtCore, QtGui
282-from openlp.core.lib import ThemeXML, Renderer, file_to_xml, str_to_bool, \
283- translate
284
285+from openlp.core.lib import ThemeXML, file_to_xml, translate
286 from amendthemedialog import Ui_AmendThemeDialog
287
288 log = logging.getLogger(u'AmendThemeForm')
289
290=== modified file 'openlp/core/ui/maindisplay.py'
291--- openlp/core/ui/maindisplay.py 2009-09-21 19:26:10 +0000
292+++ openlp/core/ui/maindisplay.py 2009-09-25 14:20:28 +0000
293@@ -25,8 +25,7 @@
294 import logging
295 from PyQt4 import QtCore, QtGui
296
297-from time import sleep
298-from openlp.core.lib import translate, Receiver
299+from openlp.core.lib import Receiver
300
301 class MainDisplay(QtGui.QWidget):
302 """
303
304=== modified file 'openlp/core/ui/mainwindow.py'
305--- openlp/core/ui/mainwindow.py 2009-09-23 18:49:26 +0000
306+++ openlp/core/ui/mainwindow.py 2009-09-25 14:20:28 +0000
307@@ -30,11 +30,9 @@
308 from openlp.core.ui import AboutForm, SettingsForm, AlertForm, \
309 ServiceManager, ThemeManager, MainDisplay, SlideController, \
310 PluginForm
311-from openlp.core.lib import translate, Plugin, MediaManagerItem, \
312- SettingsTab, RenderManager, PluginConfig, str_to_bool, OpenLPDockWidget, \
313- SettingsManager, PluginManager, Receiver
314+from openlp.core.lib import translate, RenderManager, PluginConfig, \
315+ OpenLPDockWidget, SettingsManager, PluginManager, Receiver
316
317-from openlp.core.utils import ConfigHelper
318
319 class Ui_MainWindow(object):
320 def setupUi(self, MainWindow):
321
322=== modified file 'openlp/core/ui/servicemanager.py'
323--- openlp/core/ui/servicemanager.py 2009-09-21 17:56:36 +0000
324+++ openlp/core/ui/servicemanager.py 2009-09-25 14:20:28 +0000
325@@ -23,18 +23,14 @@
326 ###############################################################################
327
328 import os
329-import sys
330 import string
331 import logging
332 import cPickle
333 import zipfile
334-import shutil
335
336 from PyQt4 import QtCore, QtGui
337 from openlp.core.lib import PluginConfig, OpenLPToolbar, ServiceItem, \
338- RenderManager, translate, buildIcon, ServiceType, \
339- contextMenuAction, contextMenuSeparator, Receiver
340-from openlp.core.utils import ConfigHelper
341+ translate, ServiceType, contextMenuAction, contextMenuSeparator, Receiver
342
343 class ServiceManagerList(QtGui.QTreeWidget):
344
345
346=== modified file 'openlp/core/ui/settingsform.py'
347--- openlp/core/ui/settingsform.py 2009-09-20 15:45:33 +0000
348+++ openlp/core/ui/settingsform.py 2009-09-25 14:20:28 +0000
349@@ -24,9 +24,8 @@
350
351 import logging
352
353-from PyQt4 import QtCore, QtGui
354+from PyQt4 import QtGui
355
356-from openlp.core.lib import SettingsTab
357 from openlp.core.ui import GeneralTab, ThemesTab, AlertsTab
358 from settingsdialog import Ui_SettingsDialog
359
360
361=== modified file 'openlp/core/ui/slidecontroller.py'
362--- openlp/core/ui/slidecontroller.py 2009-09-21 17:56:36 +0000
363+++ openlp/core/ui/slidecontroller.py 2009-09-25 14:20:28 +0000
364@@ -23,12 +23,10 @@
365 ###############################################################################
366
367 import logging
368-import os
369 import time
370
371 from PyQt4 import QtCore, QtGui
372-from openlp.core.lib import OpenLPToolbar, translate, buildIcon, Receiver, \
373- ServiceType, RenderManager, SettingsManager
374+from openlp.core.lib import OpenLPToolbar, translate, Receiver, ServiceType
375
376 class SlideList(QtGui.QTableWidget):
377 """
378
379=== modified file 'openlp/core/ui/test/test_service_manager.py'
380--- openlp/core/ui/test/test_service_manager.py 2009-09-19 21:45:50 +0000
381+++ openlp/core/ui/test/test_service_manager.py 2009-09-25 14:20:28 +0000
382@@ -16,20 +16,18 @@
383 Place, Suite 330, Boston, MA 02111-1307 USA
384 """
385
386-import time
387 import sys
388 import os, os.path
389 import logging
390-from PyQt4 import QtGui, QtCore
391-from PyQt4.QtCore import *
392-from PyQt4.QtGui import *
393+
394+from PyQt4 import QtGui
395+
396+from openlp.core.ui import ServiceManager
397+from openlp.plugins.images.lib import ImageServiceItem
398
399 mypath = os.path.split(os.path.abspath(__file__))[0]
400 sys.path.insert(0, (os.path.join(mypath, '..', '..', '..', '..')))
401
402-from openlp.core.ui import ServiceManager
403-from openlp.plugins.images.lib import ImageServiceItem
404-
405 logging.basicConfig(filename='test_service_manager.log', level=logging.INFO,
406 filemode='w')
407
408
409=== modified file 'openlp/core/ui/thememanager.py'
410--- openlp/core/ui/thememanager.py 2009-09-24 01:37:21 +0000
411+++ openlp/core/ui/thememanager.py 2009-09-25 14:20:28 +0000
412@@ -23,7 +23,6 @@
413 ###############################################################################
414
415 import os
416-import sys
417 import zipfile
418 import shutil
419 import logging
420@@ -31,10 +30,10 @@
421 from xml.etree.ElementTree import ElementTree, XML
422 from PyQt4 import QtCore, QtGui
423
424-from openlp.core.ui import AmendThemeForm, ServiceManager
425+from openlp.core.ui import AmendThemeForm
426 from openlp.core.theme import Theme
427-from openlp.core.lib import PluginConfig, OpenLPToolbar, ThemeXML, Renderer, \
428- translate, str_to_bool, file_to_xml, buildIcon, Receiver
429+from openlp.core.lib import PluginConfig, OpenLPToolbar, ThemeXML, translate, \
430+ str_to_bool, file_to_xml, buildIcon, Receiver
431 from openlp.core.utils import ConfigHelper
432
433 class ThemeManager(QtGui.QWidget):
434
435=== modified file 'openlp/core/utils/registry.py'
436--- openlp/core/utils/registry.py 2009-09-08 19:58:05 +0000
437+++ openlp/core/utils/registry.py 2009-09-25 14:20:28 +0000
438@@ -23,7 +23,7 @@
439 ###############################################################################
440
441 import os
442-import sys
443+
444 from ConfigParser import SafeConfigParser
445
446 class Registry(object):
447
448=== modified file 'openlp/migration/migratebibles.py'
449--- openlp/migration/migratebibles.py 2009-09-08 19:58:05 +0000
450+++ openlp/migration/migratebibles.py 2009-09-25 14:20:28 +0000
451@@ -22,8 +22,6 @@
452 # Temple Place, Suite 330, Boston, MA 02111-1307 USA #
453 ###############################################################################
454
455-import logging
456-
457 class MigrateBibles():
458 def __init__(self, display):
459 self.display = display
460
461=== modified file 'openlp/migration/migratesongs.py'
462--- openlp/migration/migratesongs.py 2009-09-21 23:11:50 +0000
463+++ openlp/migration/migratesongs.py 2009-09-25 14:20:28 +0000
464@@ -24,17 +24,15 @@
465
466 import os
467 import sys
468-import logging
469 import sqlite3
470-from openlp.core.lib import PluginConfig
471
472 from sqlalchemy import *
473-from sqlalchemy.sql import select
474 from sqlalchemy import create_engine
475-from sqlalchemy.orm import scoped_session, sessionmaker, mapper, relation, \
476- clear_mappers
477-from openlp.plugins.songs.lib.models import metadata, session, \
478- engine, songs_table, Song, Author, Topic, Book
479+from sqlalchemy.orm import scoped_session, sessionmaker, mapper, relation
480+
481+from openlp.core.lib import PluginConfig
482+from openlp.plugins.songs.lib.models import metadata, songs_table, Song, \
483+ Author, Topic, Book
484 from openlp.plugins.songs.lib.tables import *
485 from openlp.plugins.songs.lib.classes import *
486
487
488=== modified file 'openlp/plugins/audit/lib/audittab.py'
489--- openlp/plugins/audit/lib/audittab.py 2009-09-23 15:51:03 +0000
490+++ openlp/plugins/audit/lib/audittab.py 2009-09-25 14:20:28 +0000
491@@ -22,9 +22,9 @@
492 # Temple Place, Suite 330, Boston, MA 02111-1307 USA #
493 ###############################################################################
494
495-from PyQt4 import QtCore, QtGui
496+from PyQt4 import QtGui
497
498-from openlp.core.lib import SettingsTab, str_to_bool, translate, Receiver
499+from openlp.core.lib import SettingsTab, translate, Receiver
500
501 class AuditTab(SettingsTab):
502 """
503
504=== modified file 'openlp/plugins/audit/lib/manager.py'
505--- openlp/plugins/audit/lib/manager.py 2009-09-23 17:36:22 +0000
506+++ openlp/plugins/audit/lib/manager.py 2009-09-25 14:20:28 +0000
507@@ -22,15 +22,10 @@
508 # Temple Place, Suite 330, Boston, MA 02111-1307 USA #
509 ###############################################################################
510
511-import os, os.path
512-import sys
513-
514-from sqlalchemy import asc, desc
515-from openlp.plugins.audit.lib.models import init_models, metadata, session, \
516- engine, AuditItem, audit_table
517-
518 import logging
519
520+from openlp.plugins.audit.lib.models import init_models, metadata, AuditItem
521+
522 class AuditManager():
523 """
524 The Song Manager provides a central location for all database code. This
525
526=== modified file 'openlp/plugins/audit/lib/meta.py'
527--- openlp/plugins/audit/lib/meta.py 2009-09-24 04:32:24 +0000
528+++ openlp/plugins/audit/lib/meta.py 2009-09-25 14:20:28 +0000
529@@ -24,7 +24,6 @@
530
531
532 from sqlalchemy import MetaData
533-from sqlalchemy.orm import scoped_session, sessionmaker
534
535 __all__ = ['session', 'metadata', 'engine']
536
537
538=== modified file 'openlp/plugins/audit/lib/models.py'
539--- openlp/plugins/audit/lib/models.py 2009-09-23 15:51:03 +0000
540+++ openlp/plugins/audit/lib/models.py 2009-09-25 14:20:28 +0000
541@@ -23,9 +23,9 @@
542 ###############################################################################
543
544 from sqlalchemy import create_engine
545-from sqlalchemy.orm import scoped_session, sessionmaker, mapper, relation
546+from sqlalchemy.orm import scoped_session, sessionmaker, mapper
547
548-from openlp.plugins.audit.lib.meta import session, metadata, engine
549+from openlp.plugins.audit.lib.meta import metadata
550 from openlp.plugins.audit.lib.tables import *
551 from openlp.plugins.audit.lib.classes import *
552
553
554=== modified file 'openlp/plugins/audit/lib/tables.py'
555--- openlp/plugins/audit/lib/tables.py 2009-09-24 04:48:12 +0000
556+++ openlp/plugins/audit/lib/tables.py 2009-09-25 14:20:28 +0000
557@@ -22,7 +22,7 @@
558 # Temple Place, Suite 330, Boston, MA 02111-1307 USA #
559 ###############################################################################
560
561-from sqlalchemy import Column, Table, ForeignKey, types
562+from sqlalchemy import Column, Table, types
563
564 from openlp.plugins.audit.lib.meta import metadata
565
566
567=== modified file 'openlp/plugins/bibles/forms/bibleimportform.py'
568--- openlp/plugins/bibles/forms/bibleimportform.py 2009-09-21 17:56:36 +0000
569+++ openlp/plugins/bibles/forms/bibleimportform.py 2009-09-25 14:20:28 +0000
570@@ -22,11 +22,8 @@
571 # Temple Place, Suite 330, Boston, MA 02111-1307 USA #
572 ###############################################################################
573
574-import sys
575+import logging
576 import os, os.path
577-import sys
578-import time
579-import logging
580
581 from PyQt4 import QtCore, QtGui
582
583
584=== modified file 'openlp/plugins/bibles/lib/bibleCSVimpl.py'
585--- openlp/plugins/bibles/lib/bibleCSVimpl.py 2009-09-21 17:56:36 +0000
586+++ openlp/plugins/bibles/lib/bibleCSVimpl.py 2009-09-25 14:20:28 +0000
587@@ -25,11 +25,9 @@
588 import logging
589 import chardet
590
591-from openlp.plugins.bibles.lib.bibleDBimpl import BibleDBImpl
592 from openlp.plugins.bibles.lib.common import BibleCommon
593 from openlp.core.lib import Receiver
594
595-
596 class BibleCSVImpl(BibleCommon):
597 global log
598 log=logging.getLogger(u'BibleCSVImpl')
599
600=== modified file 'openlp/plugins/bibles/lib/bibleDBimpl.py'
601--- openlp/plugins/bibles/lib/bibleDBimpl.py 2009-09-21 23:11:50 +0000
602+++ openlp/plugins/bibles/lib/bibleDBimpl.py 2009-09-25 14:20:28 +0000
603@@ -26,7 +26,6 @@
604 import logging
605
606 from common import BibleCommon
607-from openlp.core.utils import ConfigHelper
608 from openlp.plugins.bibles.lib.models import *
609
610 class BibleDBImpl(BibleCommon):
611
612=== modified file 'openlp/plugins/bibles/lib/bibleHTTPimpl.py'
613--- openlp/plugins/bibles/lib/bibleHTTPimpl.py 2009-09-21 23:11:50 +0000
614+++ openlp/plugins/bibles/lib/bibleHTTPimpl.py 2009-09-25 14:20:28 +0000
615@@ -22,14 +22,10 @@
616 # Temple Place, Suite 330, Boston, MA 02111-1307 USA #
617 ###############################################################################
618
619-import os, os.path
620-import sys
621-import urllib2
622+import logging
623
624 from common import BibleCommon, SearchResults
625
626-import logging
627-
628 class BGExtract(BibleCommon):
629 global log
630 log=logging.getLogger(u'BibleHTTPMgr(BG_extract)')
631
632=== modified file 'openlp/plugins/bibles/lib/bibleOSISimpl.py'
633--- openlp/plugins/bibles/lib/bibleOSISimpl.py 2009-09-21 23:11:50 +0000
634+++ openlp/plugins/bibles/lib/bibleOSISimpl.py 2009-09-25 14:20:28 +0000
635@@ -30,7 +30,6 @@
636
637 from PyQt4 import QtCore
638
639-from openlp.plugins.bibles.lib.bibleDBimpl import BibleDBImpl
640 from openlp.core.lib import Receiver
641
642 class BibleOSISImpl():
643
644=== modified file 'openlp/plugins/bibles/lib/biblestab.py'
645--- openlp/plugins/bibles/lib/biblestab.py 2009-09-21 17:56:36 +0000
646+++ openlp/plugins/bibles/lib/biblestab.py 2009-09-25 14:20:28 +0000
647@@ -24,7 +24,7 @@
648
649 import logging
650
651-from PyQt4 import Qt, QtCore, QtGui
652+from PyQt4 import QtCore, QtGui
653
654 from openlp.core.lib import translate, str_to_bool, Receiver
655 from openlp.core.lib import SettingsTab
656
657=== modified file 'openlp/plugins/bibles/lib/common.py'
658--- openlp/plugins/bibles/lib/common.py 2009-09-08 19:58:05 +0000
659+++ openlp/plugins/bibles/lib/common.py 2009-09-25 14:20:28 +0000
660@@ -22,9 +22,6 @@
661 # Temple Place, Suite 330, Boston, MA 02111-1307 USA #
662 ###############################################################################
663
664-import os
665-import os.path
666-import sys
667 import urllib2
668 import chardet
669 import logging
670
671=== modified file 'openlp/plugins/bibles/lib/manager.py'
672--- openlp/plugins/bibles/lib/manager.py 2009-09-21 23:11:50 +0000
673+++ openlp/plugins/bibles/lib/manager.py 2009-09-25 14:20:28 +0000
674@@ -24,14 +24,11 @@
675
676 import logging
677 import os
678-import sys
679
680-from common import SearchResults
681 from bibleOSISimpl import BibleOSISImpl
682 from bibleCSVimpl import BibleCSVImpl
683 from bibleDBimpl import BibleDBImpl
684 from bibleHTTPimpl import BibleHTTPImpl
685-from openlp.core.lib import Receiver
686
687 class BibleMode(object):
688 Full = 1
689
690=== modified file 'openlp/plugins/bibles/lib/mediaitem.py'
691--- openlp/plugins/bibles/lib/mediaitem.py 2009-09-21 23:11:50 +0000
692+++ openlp/plugins/bibles/lib/mediaitem.py 2009-09-25 14:20:28 +0000
693@@ -27,8 +27,8 @@
694
695 from PyQt4 import QtCore, QtGui
696
697-from openlp.core.lib import translate, ServiceItem, MediaManagerItem, \
698- Receiver, contextMenuAction, contextMenuSeparator, BaseListWithDnD
699+from openlp.core.lib import translate, MediaManagerItem, Receiver, \
700+ contextMenuAction, BaseListWithDnD
701 from openlp.plugins.bibles.forms import BibleImportForm
702 from openlp.plugins.bibles.lib.manager import BibleMode
703
704
705=== modified file 'openlp/plugins/bibles/lib/models.py'
706--- openlp/plugins/bibles/lib/models.py 2009-07-18 05:43:50 +0000
707+++ openlp/plugins/bibles/lib/models.py 2009-09-25 14:20:28 +0000
708@@ -19,7 +19,6 @@
709 this program; if not, write to the Free Software Foundation, Inc., 59 Temple
710 Place, Suite 330, Boston, MA 02111-1307 USA
711 """
712-import string
713
714 from sqlalchemy import Column, Table, MetaData, ForeignKey, types, \
715 create_engine
716
717=== modified file 'openlp/plugins/bibles/test/test_bibleManager.py'
718--- openlp/plugins/bibles/test/test_bibleManager.py 2009-09-03 15:19:30 +0000
719+++ openlp/plugins/bibles/test/test_bibleManager.py 2009-09-25 14:20:28 +0000
720@@ -16,36 +16,33 @@
721 Place, Suite 330, Boston, MA 02111-1307 USA
722 """
723
724-import random
725-import unittest
726-
727+import logging
728 import os, os.path
729 import sys
730-mypath=os.path.split(os.path.abspath(__file__))[0]
731+
732+from openlp.plugins.bibles.lib.biblemanager import BibleManager
733+
734+mypath = os.path.split(os.path.abspath(__file__))[0]
735 sys.path.insert(0,(os.path.join(mypath, '..', '..','..','..')))
736
737-from openlp.plugins.bibles.lib.biblemanager import BibleManager
738-from openlp.utils import ConfigHelper
739-
740-import logging
741 logging.basicConfig(level=logging.DEBUG,
742 format='%(asctime)s %(name)-12s %(levelname)-8s %(message)s',
743 datefmt='%m-%d %H:%M',
744 filename='plugins.log',
745 filemode='w')
746
747-console=logging.StreamHandler()
748+console = logging.StreamHandler()
749 # set a format which is simpler for console use
750 formatter = logging.Formatter(u'%(name)-12s: %(levelname)-8s %(message)s')
751 # tell the handler to use this format
752 console.setFormatter(formatter)
753 logging.getLogger(u'').addHandler(console)
754-log=logging.getLogger(u'')
755+log = logging.getLogger(u'')
756
757 logging.info(u'\nLogging started')
758
759 class TestBibleManager:
760- log=logging.getLogger(u'testBibleMgr')
761+ log = logging.getLogger(u'testBibleMgr')
762 def setup_class(self):
763 log.debug(u'\n.......Register BM')
764 self.bm = BibleManager()
765
766=== modified file 'openlp/plugins/bibles/test/test_bibleManagerAPI.py'
767--- openlp/plugins/bibles/test/test_bibleManagerAPI.py 2009-09-03 15:19:30 +0000
768+++ openlp/plugins/bibles/test/test_bibleManagerAPI.py 2009-09-25 14:20:28 +0000
769@@ -16,36 +16,33 @@
770 Place, Suite 330, Boston, MA 02111-1307 USA
771 """
772
773-import random
774-import unittest
775-
776+import logging
777 import os, os.path
778 import sys
779-mypath=os.path.split(os.path.abspath(__file__))[0]
780+
781+from openlp.plugins.biblemanager.bibleManager import BibleManager
782+
783+mypath = os.path.split(os.path.abspath(__file__))[0]
784 sys.path.insert(0,(os.path.join(mypath, '..', '..','..','..')))
785
786-from openlp.plugins.biblemanager.bibleManager import BibleManager
787-from openlp.core.utils import ConfigHelper
788-
789-import logging
790 logging.basicConfig(level=logging.DEBUG,
791 format='%(asctime)s %(name)-12s %(levelname)-8s %(message)s',
792 datefmt='%m-%d %H:%M',
793 filename='plugins.log',
794 filemode='w')
795
796-console=logging.StreamHandler()
797+console = logging.StreamHandler()
798 # set a format which is simpler for console use
799 formatter = logging.Formatter(u'%(name)-12s: %(levelname)-8s %(message)s')
800 # tell the handler to use this format
801 console.setFormatter(formatter)
802 logging.getLogger(u'').addHandler(console)
803-log=logging.getLogger(u'')
804+log = logging.getLogger(u'')
805
806 logging.info(u'\nLogging started')
807
808 class TestBibleManager:
809- log=logging.getLogger(u'testBibleMgr')
810+ log = logging.getLogger(u'testBibleMgr')
811 def setup_class(self):
812 log.debug(u'\n.......Register BM')
813 self.bm = BibleManager()
814
815=== modified file 'openlp/plugins/bibles/test/test_bibleManagerCSV.py'
816--- openlp/plugins/bibles/test/test_bibleManagerCSV.py 2009-09-03 15:19:30 +0000
817+++ openlp/plugins/bibles/test/test_bibleManagerCSV.py 2009-09-25 14:20:28 +0000
818@@ -16,36 +16,33 @@
819 Place, Suite 330, Boston, MA 02111-1307 USA
820 """
821
822-import random
823-import unittest
824-
825+import logging
826 import os, os.path
827 import sys
828-mypath=os.path.split(os.path.abspath(__file__))[0]
829+
830+from openlp.plugins.bibles.lib.biblemanager import BibleManager
831+
832+mypath = os.path.split(os.path.abspath(__file__))[0]
833 sys.path.insert(0,(os.path.join(mypath, '..', '..','..','..')))
834
835-from openlp.plugins.bibles.lib.biblemanager import BibleManager
836-from openlp.utils import ConfigHelper
837-
838-import logging
839 logging.basicConfig(level=logging.DEBUG,
840 format='%(asctime)s %(name)-12s %(levelname)-8s %(message)s',
841 datefmt='%m-%d %H:%M',
842 filename='plugins.log',
843 filemode='w')
844
845-console=logging.StreamHandler()
846+console = logging.StreamHandler()
847 # set a format which is simpler for console use
848 formatter = logging.Formatter(u'%(name)-12s: %(levelname)-8s %(message)s')
849 # tell the handler to use this format
850 console.setFormatter(formatter)
851 logging.getLogger(u'').addHandler(console)
852-log=logging.getLogger(u'')
853+log = logging.getLogger(u'')
854
855 logging.info(u'\nLogging started')
856
857 class TestBibleManager:
858- log=logging.getLogger(u'testBibleMgr')
859+ log = logging.getLogger(u'testBibleMgr')
860 def setup_class(self):
861 log.debug(u'\n.......Register BM')
862 self.bm = BibleManager()
863
864=== modified file 'openlp/plugins/bibles/test/test_bibleManagerOSIS.py'
865--- openlp/plugins/bibles/test/test_bibleManagerOSIS.py 2009-09-03 15:19:30 +0000
866+++ openlp/plugins/bibles/test/test_bibleManagerOSIS.py 2009-09-25 14:20:29 +0000
867@@ -16,36 +16,33 @@
868 Place, Suite 330, Boston, MA 02111-1307 USA
869 """
870
871-import random
872-import unittest
873-
874+import logging
875 import os, os.path
876 import sys
877-mypath=os.path.split(os.path.abspath(__file__))[0]
878+
879+from openlp.plugins.bibles.lib.biblemanager import BibleManager
880+
881+mypath = os.path.split(os.path.abspath(__file__))[0]
882 sys.path.insert(0,(os.path.join(mypath, '..', '..','..','..')))
883
884-from openlp.plugins.bibles.lib.biblemanager import BibleManager
885-from openlp.utils import ConfigHelper
886-
887-import logging
888 logging.basicConfig(level=logging.DEBUG,
889 format='%(asctime)s %(name)-12s %(levelname)-8s %(message)s',
890 datefmt='%m-%d %H:%M',
891 filename='plugins.log',
892 filemode='w')
893
894-console=logging.StreamHandler()
895+console = logging.StreamHandler()
896 # set a format which is simpler for console use
897 formatter = logging.Formatter(u'%(name)-12s: %(levelname)-8s %(message)s')
898 # tell the handler to use this format
899 console.setFormatter(formatter)
900 logging.getLogger(u'').addHandler(console)
901-log=logging.getLogger(u'')
902+log = logging.getLogger(u'')
903
904 logging.info(u'\nLogging started')
905
906 class TestBibleManager:
907- log=logging.getLogger(u'testBibleMgr')
908+ log = logging.getLogger(u'testBibleMgr')
909 def setup_class(self):
910 log.debug(u'\n.......Register BM')
911 self.bm = BibleManager()
912
913=== modified file 'openlp/plugins/custom/customplugin.py'
914--- openlp/plugins/custom/customplugin.py 2009-09-12 18:27:17 +0000
915+++ openlp/plugins/custom/customplugin.py 2009-09-25 14:20:29 +0000
916@@ -24,7 +24,7 @@
917
918 import logging
919
920-from PyQt4 import QtCore, QtGui
921+from PyQt4 import QtGui
922
923 from forms import EditCustomForm
924 from openlp.core.lib import Plugin
925
926=== modified file 'openlp/plugins/custom/forms/editcustomform.py'
927--- openlp/plugins/custom/forms/editcustomform.py 2009-09-22 17:43:07 +0000
928+++ openlp/plugins/custom/forms/editcustomform.py 2009-09-25 14:20:29 +0000
929@@ -22,7 +22,7 @@
930 # Temple Place, Suite 330, Boston, MA 02111-1307 USA #
931 ###############################################################################
932
933-from PyQt4 import Qt, QtCore, QtGui
934+from PyQt4 import QtCore, QtGui
935
936 from editcustomdialog import Ui_customEditDialog
937 from openlp.core.lib import SongXMLBuilder, SongXMLParser, Receiver, translate
938
939=== modified file 'openlp/plugins/custom/lib/manager.py'
940--- openlp/plugins/custom/lib/manager.py 2009-09-23 15:51:03 +0000
941+++ openlp/plugins/custom/lib/manager.py 2009-09-25 14:20:29 +0000
942@@ -22,15 +22,10 @@
943 # Temple Place, Suite 330, Boston, MA 02111-1307 USA #
944 ###############################################################################
945
946-import os, os.path
947-import sys
948-
949-from sqlalchemy import asc, desc
950-from openlp.plugins.custom.lib.models import init_models, metadata, session, \
951- engine, CustomSlide, custom_slide_table
952-
953 import logging
954
955+from openlp.plugins.custom.lib.models import init_models, metadata, CustomSlide
956+
957 class CustomManager():
958 """
959 The Song Manager provides a central location for all database code. This
960@@ -38,7 +33,7 @@
961 """
962
963 global log
964- log=logging.getLogger(u'CustomManager')
965+ log = logging.getLogger(u'CustomManager')
966 log.info(u'Custom manager loaded')
967
968 def __init__(self, config):
969
970=== modified file 'openlp/plugins/custom/lib/mediaitem.py'
971--- openlp/plugins/custom/lib/mediaitem.py 2009-09-22 17:43:07 +0000
972+++ openlp/plugins/custom/lib/mediaitem.py 2009-09-25 14:20:29 +0000
973@@ -26,8 +26,7 @@
974
975 from PyQt4 import QtCore, QtGui
976
977-from openlp.core.lib import MediaManagerItem, SongXMLParser, ServiceItem, \
978- translate, contextMenuAction, contextMenuSeparator, BaseListWithDnD
979+from openlp.core.lib import MediaManagerItem, SongXMLParser, BaseListWithDnD
980
981 class CustomListView(BaseListWithDnD):
982 def __init__(self, parent=None):
983
984=== modified file 'openlp/plugins/custom/lib/meta.py'
985--- openlp/plugins/custom/lib/meta.py 2009-09-08 19:58:05 +0000
986+++ openlp/plugins/custom/lib/meta.py 2009-09-25 14:20:29 +0000
987@@ -23,7 +23,6 @@
988 ###############################################################################
989
990 from sqlalchemy import MetaData
991-from sqlalchemy.orm import scoped_session, sessionmaker
992
993 __all__ = ['session', 'metadata', 'engine']
994
995
996=== modified file 'openlp/plugins/custom/lib/models.py'
997--- openlp/plugins/custom/lib/models.py 2009-09-08 19:58:05 +0000
998+++ openlp/plugins/custom/lib/models.py 2009-09-25 14:20:29 +0000
999@@ -23,9 +23,9 @@
1000 ###############################################################################
1001
1002 from sqlalchemy import create_engine
1003-from sqlalchemy.orm import scoped_session, sessionmaker, mapper, relation
1004+from sqlalchemy.orm import scoped_session, sessionmaker, mapper
1005
1006-from openlp.plugins.custom.lib.meta import session, metadata, engine
1007+from openlp.plugins.custom.lib.meta import metadata
1008 from openlp.plugins.custom.lib.tables import *
1009 from openlp.plugins.custom.lib.classes import *
1010
1011
1012=== modified file 'openlp/plugins/custom/lib/tables.py'
1013--- openlp/plugins/custom/lib/tables.py 2009-09-08 19:58:05 +0000
1014+++ openlp/plugins/custom/lib/tables.py 2009-09-25 14:20:29 +0000
1015@@ -22,7 +22,7 @@
1016 # Temple Place, Suite 330, Boston, MA 02111-1307 USA #
1017 ###############################################################################
1018
1019-from sqlalchemy import Column, Table, ForeignKey, types
1020+from sqlalchemy import Column, Table, types
1021
1022 from openlp.plugins.custom.lib.meta import metadata
1023
1024
1025=== modified file 'openlp/plugins/images/imageplugin.py'
1026--- openlp/plugins/images/imageplugin.py 2009-09-22 19:23:12 +0000
1027+++ openlp/plugins/images/imageplugin.py 2009-09-25 14:20:29 +0000
1028@@ -24,7 +24,7 @@
1029
1030 import logging
1031
1032-from PyQt4 import QtCore, QtGui
1033+from PyQt4 import QtGui
1034
1035 from openlp.core.lib import Plugin
1036 from openlp.plugins.images.lib import ImageMediaItem, ImageTab
1037
1038=== modified file 'openlp/plugins/images/lib/imagetab.py'
1039--- openlp/plugins/images/lib/imagetab.py 2009-09-22 19:36:25 +0000
1040+++ openlp/plugins/images/lib/imagetab.py 2009-09-25 14:20:29 +0000
1041@@ -24,7 +24,7 @@
1042
1043 from PyQt4 import QtCore, QtGui
1044
1045-from openlp.core.lib import SettingsTab, str_to_bool, translate, Receiver
1046+from openlp.core.lib import SettingsTab, translate, Receiver
1047
1048 class ImageTab(SettingsTab):
1049 """
1050
1051=== modified file 'openlp/plugins/images/lib/mediaitem.py'
1052--- openlp/plugins/images/lib/mediaitem.py 2009-09-21 17:56:36 +0000
1053+++ openlp/plugins/images/lib/mediaitem.py 2009-09-25 14:20:29 +0000
1054@@ -26,8 +26,7 @@
1055 import os
1056
1057 from PyQt4 import QtCore, QtGui
1058-from openlp.core.lib import MediaManagerItem, ServiceItem, translate, \
1059- BaseListWithDnD, buildIcon
1060+from openlp.core.lib import MediaManagerItem, BaseListWithDnD, buildIcon
1061
1062 # We have to explicitly create separate classes for each plugin
1063 # in order for DnD to the Service manager to work correctly.
1064
1065=== modified file 'openlp/plugins/media/lib/mediaitem.py'
1066--- openlp/plugins/media/lib/mediaitem.py 2009-09-22 19:23:12 +0000
1067+++ openlp/plugins/media/lib/mediaitem.py 2009-09-25 14:20:29 +0000
1068@@ -24,14 +24,10 @@
1069
1070 import logging
1071 import os
1072-import tempfile
1073
1074 from PyQt4 import QtCore, QtGui
1075
1076-from openlp.core.lib import MediaManagerItem, ServiceItem, translate, \
1077- BaseListWithDnD, buildIcon
1078-
1079-from openlp.plugins.media.lib import MediaTab, FileListData
1080+from openlp.core.lib import MediaManagerItem, BaseListWithDnD, buildIcon
1081
1082 class MediaListView(BaseListWithDnD):
1083 def __init__(self, parent=None):
1084
1085=== modified file 'openlp/plugins/media/mediaplugin.py'
1086--- openlp/plugins/media/mediaplugin.py 2009-09-21 19:23:51 +0000
1087+++ openlp/plugins/media/mediaplugin.py 2009-09-25 14:20:29 +0000
1088@@ -22,11 +22,10 @@
1089 # Temple Place, Suite 330, Boston, MA 02111-1307 USA #
1090 ###############################################################################
1091
1092-import os
1093-from PyQt4 import QtCore, QtGui
1094+from PyQt4 import QtGui
1095
1096-from openlp.core.lib import Plugin, MediaManagerItem, SettingsTab
1097-from openlp.plugins.media.lib import MediaTab,MediaMediaItem
1098+from openlp.core.lib import Plugin
1099+from openlp.plugins.media.lib import MediaTab, MediaMediaItem
1100
1101 class MediaPlugin(Plugin):
1102
1103
1104=== modified file 'openlp/plugins/presentations/lib/impresscontroller.py'
1105--- openlp/plugins/presentations/lib/impresscontroller.py 2009-09-21 23:11:50 +0000
1106+++ openlp/plugins/presentations/lib/impresscontroller.py 2009-09-25 14:20:29 +0000
1107@@ -27,16 +27,13 @@
1108 # http://nxsy.org/comparing-documents-with-openoffice-and-python
1109
1110 import logging
1111-import os, subprocess
1112-import time
1113-import sys
1114+import os
1115
1116 if os.name == u'nt':
1117 from win32com.client import Dispatch
1118 else:
1119 import uno
1120
1121-
1122 from PyQt4 import QtCore
1123
1124 class ImpressController(object):
1125
1126=== modified file 'openlp/plugins/presentations/lib/mediaitem.py'
1127--- openlp/plugins/presentations/lib/mediaitem.py 2009-09-21 17:56:36 +0000
1128+++ openlp/plugins/presentations/lib/mediaitem.py 2009-09-25 14:20:29 +0000
1129@@ -26,8 +26,8 @@
1130 import os
1131
1132 from PyQt4 import QtCore, QtGui
1133-from openlp.core.lib import MediaManagerItem, ServiceItem, translate, \
1134- BaseListWithDnD
1135+
1136+from openlp.core.lib import MediaManagerItem, translate, BaseListWithDnD
1137 from openlp.plugins.presentations.lib import MessageListener
1138
1139 # We have to explicitly create separate classes for each plugin
1140
1141=== modified file 'openlp/plugins/presentations/lib/messagelistener.py'
1142--- openlp/plugins/presentations/lib/messagelistener.py 2009-09-21 17:56:36 +0000
1143+++ openlp/plugins/presentations/lib/messagelistener.py 2009-09-25 14:20:29 +0000
1144@@ -21,8 +21,8 @@
1145 import os
1146
1147 from PyQt4 import QtCore
1148+
1149 from openlp.core.lib import Receiver
1150-from openlp.plugins.presentations.lib import ImpressController
1151
1152 class MessageListener(object):
1153 """
1154
1155=== modified file 'openlp/plugins/presentations/lib/pptviewcontroller.py'
1156--- openlp/plugins/presentations/lib/pptviewcontroller.py 2009-09-24 07:35:30 +0000
1157+++ openlp/plugins/presentations/lib/pptviewcontroller.py 2009-09-25 14:20:29 +0000
1158@@ -23,15 +23,10 @@
1159 ###############################################################################
1160
1161 import logging
1162-import os, subprocess
1163-import time
1164-import sys
1165-import win32api
1166+
1167 from ctypes import *
1168 from ctypes.wintypes import RECT
1169
1170-from PyQt4 import QtCore
1171-
1172 class PptviewController(object):
1173 """
1174 Class to control interactions with PowerPOint Viewer Presentations
1175
1176=== modified file 'openlp/plugins/presentations/lib/presentationtab.py'
1177--- openlp/plugins/presentations/lib/presentationtab.py 2009-09-21 19:26:10 +0000
1178+++ openlp/plugins/presentations/lib/presentationtab.py 2009-09-25 14:20:29 +0000
1179@@ -22,9 +22,9 @@
1180 # Temple Place, Suite 330, Boston, MA 02111-1307 USA #
1181 ###############################################################################
1182
1183-from PyQt4 import Qt, QtCore, QtGui
1184+from PyQt4 import QtGui
1185
1186-from openlp.core.lib import SettingsTab, translate, str_to_bool
1187+from openlp.core.lib import SettingsTab, translate
1188
1189 class PresentationTab(SettingsTab):
1190 """
1191
1192=== modified file 'openlp/plugins/presentations/presentationplugin.py'
1193--- openlp/plugins/presentations/presentationplugin.py 2009-09-24 08:54:38 +0000
1194+++ openlp/plugins/presentations/presentationplugin.py 2009-09-25 14:20:29 +0000
1195@@ -23,12 +23,11 @@
1196 ###############################################################################
1197
1198 import os
1199-import sys
1200 import logging
1201
1202 from PyQt4 import QtCore, QtGui
1203
1204-from openlp.core.lib import Plugin, MediaManagerItem
1205+from openlp.core.lib import Plugin
1206 from openlp.plugins.presentations.lib import PresentationMediaItem, \
1207 PresentationTab, ImpressController
1208 if os.name == u'nt':
1209@@ -38,7 +37,6 @@
1210 pass
1211 from openlp.plugins.presentations.lib import PptviewController
1212
1213-
1214 class PresentationPlugin(Plugin):
1215
1216 global log
1217
1218=== modified file 'openlp/plugins/remotes/lib/remotetab.py'
1219--- openlp/plugins/remotes/lib/remotetab.py 2009-09-21 19:26:10 +0000
1220+++ openlp/plugins/remotes/lib/remotetab.py 2009-09-25 14:20:29 +0000
1221@@ -18,9 +18,9 @@
1222 Place, Suite 330, Boston, MA 02111-1307 USA
1223 """
1224
1225-from PyQt4 import QtCore, QtGui
1226+from PyQt4 import QtGui
1227
1228-from openlp.core.lib import SettingsTab, str_to_bool, translate
1229+from openlp.core.lib import SettingsTab, translate
1230
1231 class RemoteTab(SettingsTab):
1232 """
1233
1234=== modified file 'openlp/plugins/remotes/remoteplugin.py'
1235--- openlp/plugins/remotes/remoteplugin.py 2009-09-21 17:56:36 +0000
1236+++ openlp/plugins/remotes/remoteplugin.py 2009-09-25 14:20:29 +0000
1237@@ -18,9 +18,8 @@
1238 Place, Suite 330, Boston, MA 02111-1307 USA
1239 """
1240 import logging
1241-import sys
1242
1243-from PyQt4 import QtNetwork, QtGui, QtCore
1244+from PyQt4 import QtNetwork, QtCore
1245
1246 from openlp.core.lib import Plugin, Receiver
1247 from openlp.plugins.remotes.lib import RemoteTab
1248
1249=== modified file 'openlp/plugins/songs/forms/editsongform.py'
1250--- openlp/plugins/songs/forms/editsongform.py 2009-09-24 10:53:13 +0000
1251+++ openlp/plugins/songs/forms/editsongform.py 2009-09-25 14:20:29 +0000
1252@@ -24,10 +24,9 @@
1253
1254 import logging
1255
1256-from PyQt4 import Qt, QtCore, QtGui
1257+from PyQt4 import QtCore, QtGui
1258
1259-from openlp.core.lib import SongXMLBuilder, SongXMLParser, Receiver, \
1260- translate
1261+from openlp.core.lib import SongXMLBuilder, SongXMLParser, Receiver, translate
1262 from openlp.plugins.songs.forms import EditVerseForm
1263 from openlp.plugins.songs.lib.models import Song
1264 from editsongdialog import Ui_EditSongDialog
1265
1266=== modified file 'openlp/plugins/songs/forms/editverseform.py'
1267--- openlp/plugins/songs/forms/editverseform.py 2009-09-08 19:58:05 +0000
1268+++ openlp/plugins/songs/forms/editverseform.py 2009-09-25 14:20:29 +0000
1269@@ -22,7 +22,7 @@
1270 # Temple Place, Suite 330, Boston, MA 02111-1307 USA #
1271 ###############################################################################
1272
1273-from PyQt4 import Qt, QtCore, QtGui
1274+from PyQt4 import QtCore, QtGui
1275
1276 from editversedialog import Ui_EditVerseDialog
1277
1278
1279=== modified file 'openlp/plugins/songs/forms/songbookform.py'
1280--- openlp/plugins/songs/forms/songbookform.py 2009-09-08 19:58:05 +0000
1281+++ openlp/plugins/songs/forms/songbookform.py 2009-09-25 14:20:29 +0000
1282@@ -22,7 +22,8 @@
1283 # Temple Place, Suite 330, Boston, MA 02111-1307 USA #
1284 ###############################################################################
1285
1286-from PyQt4 import QtGui, QtCore
1287+from PyQt4 import QtGui
1288+
1289 from openlp.core.lib import translate
1290 from openlp.plugins.songs.forms.songbookdialog import Ui_SongBookDialog
1291
1292
1293=== modified file 'openlp/plugins/songs/forms/topicsform.py'
1294--- openlp/plugins/songs/forms/topicsform.py 2009-09-08 19:58:05 +0000
1295+++ openlp/plugins/songs/forms/topicsform.py 2009-09-25 14:20:29 +0000
1296@@ -22,7 +22,8 @@
1297 # Temple Place, Suite 330, Boston, MA 02111-1307 USA #
1298 ###############################################################################
1299
1300-from PyQt4 import QtGui, QtCore
1301+from PyQt4 import QtGui
1302+
1303 from openlp.core.lib import translate
1304 from openlp.plugins.songs.forms.topicsdialog import Ui_TopicsDialog
1305
1306
1307=== modified file 'openlp/plugins/songs/lib/manager.py'
1308--- openlp/plugins/songs/lib/manager.py 2009-09-21 17:56:36 +0000
1309+++ openlp/plugins/songs/lib/manager.py 2009-09-25 14:20:29 +0000
1310@@ -22,15 +22,11 @@
1311 # Temple Place, Suite 330, Boston, MA 02111-1307 USA #
1312 ###############################################################################
1313
1314-import os, os.path
1315-import sys
1316-
1317-from sqlalchemy import asc, desc
1318-from openlp.plugins.songs.lib.models import init_models, metadata, session, \
1319- engine, songs_table, Song, Author, Topic, Book
1320-
1321 import logging
1322
1323+from openlp.plugins.songs.lib.models import init_models, metadata, Song, \
1324+ Author, Topic, Book
1325+
1326 class SongManager():
1327 """
1328 The Song Manager provides a central location for all database code. This
1329
1330=== modified file 'openlp/plugins/songs/lib/mediaitem.py'
1331--- openlp/plugins/songs/lib/mediaitem.py 2009-09-24 15:49:17 +0000
1332+++ openlp/plugins/songs/lib/mediaitem.py 2009-09-25 14:20:29 +0000
1333@@ -26,9 +26,8 @@
1334
1335 from PyQt4 import QtCore, QtGui
1336
1337-from openlp.core.lib import MediaManagerItem, translate, ServiceItem, \
1338- SongXMLParser, contextMenuAction, contextMenuSeparator, BaseListWithDnD, \
1339- Receiver
1340+from openlp.core.lib import MediaManagerItem, translate, SongXMLParser, \
1341+ contextMenuAction, contextMenuSeparator, BaseListWithDnD, Receiver
1342 from openlp.plugins.songs.forms import EditSongForm, SongMaintenanceForm
1343
1344 class SongListView(BaseListWithDnD):
1345
1346=== modified file 'openlp/plugins/songs/lib/meta.py'
1347--- openlp/plugins/songs/lib/meta.py 2009-09-08 19:58:05 +0000
1348+++ openlp/plugins/songs/lib/meta.py 2009-09-25 14:20:29 +0000
1349@@ -23,7 +23,6 @@
1350 ###############################################################################
1351
1352 from sqlalchemy import MetaData
1353-from sqlalchemy.orm import scoped_session, sessionmaker
1354
1355 __all__ = ['session', 'metadata', 'engine']
1356
1357
1358=== modified file 'openlp/plugins/songs/lib/models.py'
1359--- openlp/plugins/songs/lib/models.py 2009-09-21 00:47:10 +0000
1360+++ openlp/plugins/songs/lib/models.py 2009-09-25 14:20:29 +0000
1361@@ -25,7 +25,7 @@
1362 from sqlalchemy import create_engine
1363 from sqlalchemy.orm import scoped_session, sessionmaker, mapper, relation
1364
1365-from openlp.plugins.songs.lib.meta import session, metadata, engine
1366+from openlp.plugins.songs.lib.meta import metadata
1367 from openlp.plugins.songs.lib.tables import *
1368 from openlp.plugins.songs.lib.classes import *
1369
1370
1371=== modified file 'openlp/plugins/songs/lib/songstab.py'
1372--- openlp/plugins/songs/lib/songstab.py 2009-09-08 19:58:05 +0000
1373+++ openlp/plugins/songs/lib/songstab.py 2009-09-25 14:20:29 +0000
1374@@ -22,8 +22,6 @@
1375 # Temple Place, Suite 330, Boston, MA 02111-1307 USA #
1376 ###############################################################################
1377
1378-from PyQt4 import QtCore, QtGui
1379-
1380 from openlp.core.lib import SettingsTab, translate
1381
1382 class SongsTab(SettingsTab):
1383
1384=== modified file 'openlp/plugins/songs/songsplugin.py'
1385--- openlp/plugins/songs/songsplugin.py 2009-09-21 17:56:36 +0000
1386+++ openlp/plugins/songs/songsplugin.py 2009-09-25 14:20:29 +0000
1387@@ -27,7 +27,7 @@
1388 from PyQt4 import QtCore, QtGui
1389
1390 from openlp.core.lib import Plugin, translate
1391-from openlp.plugins.songs.lib import SongManager, SongsTab, SongMediaItem
1392+from openlp.plugins.songs.lib import SongManager, SongMediaItem
1393 from openlp.plugins.songs.forms import OpenLPImportForm, OpenSongExportForm, \
1394 OpenSongImportForm, OpenLPExportForm
1395
1396
1397=== modified file 'openlp/plugins/songs/test/test_song_verse.py'
1398--- openlp/plugins/songs/test/test_song_verse.py 2009-09-03 15:19:30 +0000
1399+++ openlp/plugins/songs/test/test_song_verse.py 2009-09-25 14:20:29 +0000
1400@@ -17,7 +17,7 @@
1401 this program; if not, write to the Free Software Foundation, Inc., 59 Temple
1402 Place, Suite 330, Boston, MA 02111-1307 USA
1403 """
1404-import py.test
1405+
1406 import os
1407 import sys
1408
1409
1410=== modified file 'openlpcnv.pyw'
1411--- openlpcnv.pyw 2009-09-21 17:56:36 +0000
1412+++ openlpcnv.pyw 2009-09-25 14:20:28 +0000
1413@@ -24,10 +24,8 @@
1414 ###############################################################################
1415
1416 import os
1417-import sys
1418 import logging
1419 import time
1420-import datetime
1421
1422 from openlp.migration.display import *
1423 from openlp.migration.migratefiles import *