Head 1184

.bzrignore

@@ -19,3 +19,4 @@ _eric4project
 *.qm
 openlp/core/resources.py.old
 *.qm
+resources/windows/warnOpenLP.txt

openlp.pyw

@@ -162,6 +162,10 @@ class OpenLP(QtGui.QApplication):
         #provide a listener for widgets to reqest a screen update.
         QtCore.QObject.connect(Receiver.get_receiver(),
             QtCore.SIGNAL(u'openlp_process_events'), self.processEvents)
+        QtCore.QObject.connect(Receiver.get_receiver(),
+            QtCore.SIGNAL(u'cursor_busy'), self.setBusyCursor)
+        QtCore.QObject.connect(Receiver.get_receiver(),
+            QtCore.SIGNAL(u'cursor_normal'), self.setNormalCursor)
         self.setOrganizationName(u'OpenLP')
         self.setOrganizationDomain(u'openlp.org')
         self.setApplicationName(u'OpenLP')
@@ -201,8 +205,21 @@ class OpenLP(QtGui.QApplication):
             self.exceptionForm = ExceptionForm(self.mainWindow)
         self.exceptionForm.exceptionTextEdit.setPlainText(
             ''.join(format_exception(exctype, value, traceback)))
+        self.setNormalCursor()
         self.exceptionForm.exec_()
 
+    def setBusyCursor(self):
+        """
+        Sets the Busy Cursor for the Application
+        """
+        self.setOverrideCursor(QtCore.Qt.BusyCursor)
+
+    def setNormalCursor(self):
+        """
+        Sets the Normal Cursor forthe Application
+        """
+        self.restoreOverrideCursor()
+
 def main():
     """
     The main function which parses command line options and then runs
@@ -264,4 +281,4 @@ if __name__ == u'__main__':
     """
     Instantiate and run the application.
     """
-    main()
+    main()

openlp/core/lib/eventreceiver.py

@@ -220,6 +220,21 @@ class EventReceiver(QtCore.QObject):
         Waits for openlp to do something "interesting" and sends a
         remotes_poll_response signal when it does
 
+    ``openlp_warning_message``
+        Displays a standalone Warning Message
+
+    ``openlp_error_message``
+        Displays a standalone Error Message
+
+    ``openlp_information_message``
+        Displays a standalone Information Message
+
+    ``cursor_busy``
+        Makes the cursor got to a busy form
+
+    ``cursor_normal``
+        Resets the cursor to default
+
     """
     def __init__(self):
         """

openlp/core/lib/mediamanageritem.py

@@ -349,11 +349,13 @@ class MediaManagerItem(QtGui.QWidget):
             self.OnNewFileMasks)
         log.info(u'New files(s) %s', unicode(files))
         if files:
+            Receiver.send_message(u'cursor_busy')
             self.loadList(files)
             lastDir = os.path.split(unicode(files[0]))[0]
             SettingsManager.set_last_dir(self.settingsSection, lastDir)
             SettingsManager.set_list(self.settingsSection,
                 self.settingsSection, self.getFileList())
+        Receiver.send_message(u'cursor_normal')
 
     def getFileList(self):
         """

openlp/core/ui/mainwindow.py

@@ -590,6 +590,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
             QtCore.SIGNAL(u'config_screen_changed'), self.screenChanged)
         QtCore.QObject.connect(Receiver.get_receiver(),
             QtCore.SIGNAL(u'maindisplay_status_text'), self.showStatusMessage)
+        Receiver.send_message(u'cursor_busy')
         # Simple message boxes
         QtCore.QObject.connect(Receiver.get_receiver(),
             QtCore.SIGNAL(u'openlp_error_message'), self.onErrorMessage)
@@ -645,6 +646,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
             if savedPlugin != -1:
                 self.MediaToolBox.setCurrentIndex(savedPlugin)
         self.settingsForm.postSetUp()
+        Receiver.send_message(u'cursor_normal')
 
     def setAutoLanguage(self, value):
         self.LanguageGroup.setDisabled(value)
@@ -677,7 +679,6 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
         if QtCore.QSettings().value(
             self.generalSettingsSection + u'/auto open',
             QtCore.QVariant(False)).toBool():
-            #self.ServiceManagerContents.onLoadService(True)
             self.ServiceManagerContents.loadLastFile()
         view_mode = QtCore.QSettings().value(u'%s/view mode' % \
             self.generalSettingsSection, u'default')

openlp/core/ui/servicemanager.py

@@ -109,12 +109,12 @@ class ServiceManager(QtGui.QWidget):
         self.suffixes = []
         self.dropPosition = 0
         self.expandTabs = False
-        #is a new service and has not been saved
+        # is a new service and has not been saved
         self._modified = False
         self._fileName = u''
         self.serviceNoteForm = ServiceNoteForm(self.parent)
         self.serviceItemEditForm = ServiceItemEditForm(self.parent)
-        #start with the layout
+        # start with the layout
         self.layout = QtGui.QVBoxLayout(self)
         self.layout.setSpacing(0)
         self.layout.setMargin(0)
@@ -308,6 +308,8 @@ class ServiceManager(QtGui.QWidget):
         """
         self._fileName = unicode(fileName)
         self.parent.setServiceModified(self.isModified, self.shortFileName())
+        QtCore.QSettings(). \
+            setValue(u'service/last file',QtCore.QVariant(fileName))
 
     def fileName(self):
         """
@@ -393,6 +395,8 @@ class ServiceManager(QtGui.QWidget):
         self.serviceItems = []
         self.setFileName(u'')
         self.setModified(False)
+        QtCore.QSettings(). \
+            setValue(u'service/last file',QtCore.QVariant(u''))
 
     def saveFile(self):
         """
@@ -533,13 +537,21 @@ class ServiceManager(QtGui.QWidget):
         self.setFileName(fileName)
         self.parent.addRecentFile(fileName)
         self.setModified(False)
+        QtCore.QSettings(). \
+            setValue(u'service/last file',QtCore.QVariant(fileName))
         # Refresh Plugin lists
         Receiver.send_message(u'plugin_list_refresh')
 
     def loadLastFile(self):
-        if not self.parent.recentFiles:
+        """
-            return
+        Load the last service item from the service manager when the
-        self.loadFile(self.parent.recentFiles[0])
+        service was last closed. Can be blank if there was no service
+        present.
+        """
+        fileName = QtCore.QSettings(). \
+            value(u'service/last file',QtCore.QVariant(u'')).toString()
+        if fileName:
+            self.loadFile(fileName)
 
     def contextMenu(self, point):
         item = self.serviceManagerList.itemAt(point)
@@ -898,6 +910,7 @@ class ServiceManager(QtGui.QWidget):
         Rebuild the service list as things have changed and a
         repaint is the easiest way to do this.
         """
+        Receiver.send_message(u'cursor_busy')
         log.debug(u'regenerateServiceItems')
         # force reset of renderer as theme data has changed
         self.parent.renderManager.themedata = None
@@ -912,6 +925,7 @@ class ServiceManager(QtGui.QWidget):
             # Set to False as items may have changed rendering
             # does not impact the saved song so True may also be valid
             self.setModified(True)
+        Receiver.send_message(u'cursor_normal')
 
     def serviceItemUpdate(self, message):
         """

openlp/core/ui/slidecontroller.py

@@ -386,7 +386,6 @@ class SlideController(QtGui.QWidget):
         Settings dialog has changed the screen size of adjust output and
         screen previews.
         """
-        log.debug(u'screenSizeChanged live = %s' % self.isLive)
         # rebuild display as screen size changed
         self.display = MainDisplay(self, self.screens, self.isLive)
         self.display.imageManager = self.parent.renderManager.image_manager
@@ -402,7 +401,6 @@ class SlideController(QtGui.QWidget):
         Takes care of the SlidePreview's size. Is called when one of the the
         splitters is moved or when the screen size is changed.
         """
-        log.debug(u'previewSizeChanged live = %s' % self.isLive)
         if self.ratio < float(self.PreviewFrame.width()) / float(
             self.PreviewFrame.height()):
             # We have to take the height as limit.

openlp/plugins/images/lib/mediaitem.py

@@ -139,8 +139,6 @@ class ImageMediaItem(MediaManagerItem):
                 self.settingsSection, self.getFileList())
 
     def loadList(self, list):
-        self.listView.setCursor(QtCore.Qt.BusyCursor)
-        Receiver.send_message(u'openlp_process_events')
         for file in list:
             filename = os.path.split(unicode(file))[1]
             thumb = os.path.join(self.servicePath, filename)
@@ -155,8 +153,6 @@ class ImageMediaItem(MediaManagerItem):
             item_name.setIcon(icon)
             item_name.setData(QtCore.Qt.UserRole, QtCore.QVariant(file))
             self.listView.addItem(item_name)
-        self.listView.setCursor(QtCore.Qt.ArrowCursor)
-        Receiver.send_message(u'openlp_process_events')
 
     def generateSlideData(self, service_item, item=None, xmlVersion=False):
         items = self.listView.selectedIndexes()

openlp/plugins/songs/forms/editsongform.py

@@ -186,9 +186,11 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
         self.AuthorsListView.clear()
         self.TopicsListView.clear()
         self.TitleEditItem.setFocus(QtCore.Qt.OtherFocusReason)
+        self.songBookNumberEdit.setText(u'')
         self.loadAuthors()
         self.loadTopics()
         self.loadBooks()
+        self.ThemeSelectionComboItem.setCurrentIndex(0)
         # it's a new song to preview is not possible
         self.previewButton.setVisible(False)
 
@@ -753,4 +755,4 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
     def processTitle(self):
         log.debug(u'processTitle')
         self.song.search_title = re.sub(r'[\'"`,;:(){}?]+', u'',
-            unicode(self.song.search_title)).lower()
+            unicode(self.song.search_title)).lower()

resources/windows/warnOpenLP.txt

@@ -1,611 +0,0 @@
-W: no module named openlp.core.lib.build_html (top-level import by openlp.core.ui.maindisplay)
-W: no module named mx (top-level import by sqlite.main)
-W: no module named ctypes.create_string_buffer (delayed import by urllib)
-W: no module named openlp.core.ui.ServiceNoteForm (top-level import by openlp.core.ui.servicemanager)
-W: no module named openlp.core.lib.MediaManagerItem (top-level import by openlp.plugins.images.lib.mediaitem)
-W: no module named openlp.core.lib.SettingsManager (top-level import by openlp.core.ui.mainwindow)
-W: no module named email.Iterators (delayed import by email.message)
-W: no module named openlp.core.lib.translate (top-level import by openlp.plugins.custom.lib.mediaitem)
-W: no module named sqlalchemy.sql.join (top-level import by sqlalchemy)
-W: no module named java (conditional import by xml.sax._exceptions)
-W: no module named openlp.plugins.images.lib.ImageMediaItem (top-level import by openlp.plugins.images.imageplugin)
-W: no module named sqlalchemy.SMALLINT (top-level import by sqlalchemy.databases.sybase)
-W: no module named sqlalchemy.engine.create_engine (top-level import by sqlalchemy)
-W: no module named sqlalchemy.sql.asc (top-level import by sqlalchemy)
-W: no module named openlp.plugins.bibles.lib.BiblesTab (top-level import by openlp.plugins.bibles.bibleplugin)
-W: no module named PyQt4._qt (top-level import by PyQt4.QtCore)
-W: no module named openlp.core.lib.translate (top-level import by openlp.plugins.alerts.lib.alertstab)
-W: no module named sqlalchemy.Column (top-level import by openlp.plugins.custom.lib.db)
-W: no module named openlp.core.lib.build_icon (top-level import by openlp.plugins.songusage.songusageplugin)
-W: no module named openlp.plugins.alerts.lib.AlertsManager (top-level import by openlp.plugins.alerts.alertsplugin)
-W: no module named openlp.core.lib.Receiver (top-level import by openlp.core.ui.generaltab)
-W: no module named openlp.core.lib.translate (top-level import by openlp.plugins.alerts.forms.alertdialog)
-W: no module named openlp.core.lib.check_item_selected (top-level import by openlp.plugins.custom.lib.mediaitem)
-W: no module named sqlalchemy.orm.MapperExtension (top-level import by sqlalchemy.orm.scoping)
-W: no module named pyodbc (delayed import by sqlalchemy.databases.access)
-W: no module named openlp.core.lib.expand_tags (top-level import by openlp.core.lib.renderer)
-W: no module named openlp.core.lib.Receiver (top-level import by openlp.core.ui.servicemanager)
-W: no module named sqlalchemy.exceptions (top-level import by sqlalchemy.orm.dynamic)
-W: no module named ctypes._SimpleCData (top-level import by ctypes.wintypes)
-W: no module named openlp.core.lib.SettingsTab (top-level import by openlp.core.ui.generaltab)
-W: no module named simplejson (conditional import by openlp.plugins.remotes.lib.httpserver)
-W: no module named openlp.core.lib.build_icon (top-level import by openlp.plugins.alerts.forms.alertdialog)
-W: no module named sqlalchemy.exceptions (top-level import by sqlalchemy.orm.collections)
-W: no module named openlp.core.lib.resize_image (top-level import by openlp.core.lib.serviceitem)
-W: no module named openlp.plugins.songs.lib.SongXMLParser (top-level import by openlp.plugins.songs.forms.editsongform)
-W: no module named openlp.core.lib.translate (top-level import by openlp.plugins.bibles.bibleplugin)
-W: no module named xml.dom.XMLNS_NAMESPACE (top-level import by xml.dom.minidom)
-W: no module named openlp.plugins.songs.lib.VerseType (top-level import by openlp.plugins.songs.lib.songimport)
-W: no module named openlp.plugins.songs.lib.SongXMLBuilder (top-level import by openlp.plugins.songs.forms.editsongform)
-W: no module named openlp.core.ui.GeneralTab (top-level import by openlp.core.ui.settingsform)
-W: no module named openlp.core.lib.SettingsManager (top-level import by openlp.plugins.images.lib.mediaitem)
-W: no module named openlp.core.lib.BaseListWithDnD (top-level import by openlp.plugins.presentations.lib.mediaitem)
-W: no module named openlp.core.lib.build_icon (top-level import by openlp.plugins.presentations.presentationplugin)
-W: no module named informixdb (delayed import by sqlalchemy.databases.informix)
-W: no module named openlp.core.lib.Plugin (top-level import by openlp.plugins.custom.customplugin)
-W: no module named cjkcodecs (top-level import by BeautifulSoup)
-W: no module named readline (delayed, conditional import by cmd)
-W: no module named openlp.core.lib.Receiver (top-level import by openlp.plugins.songs.lib.songimport)
-W: no module named openlp.core.lib.Plugin (top-level import by openlp.plugins.media.mediaplugin)
-W: no module named openlp.core.lib.ThemeXML (top-level import by openlp.core.ui.amendthemeform)
-W: no module named openlp.core.lib.translate (top-level import by openlp.plugins.bibles.lib.manager)
-W: no module named openlp.core.lib.Receiver (top-level import by openlp.plugins.custom.lib.mediaitem)
-W: no module named openlp.core.lib.ServiceItem (top-level import by openlp.core.ui.maindisplay)
-W: no module named openlp.plugins.songs.forms.EditVerseForm (top-level import by openlp.plugins.songs.forms.editsongform)
-W: no module named openlp.core.lib.translate (top-level import by openlp.plugins.songs.lib.ewimport)
-W: no module named openlp.core.lib.SettingsTab (top-level import by openlp.plugins.songs.lib.songstab)
-W: no module named openlp.core.utils.AppLocation (top-level import by openlp.core.ui.thememanager)
-W: no module named openlp.core.ui.HideMode (top-level import by openlp.core.ui.maindisplay)
-W: no module named sqlalchemy.Column (top-level import by sqlalchemy.databases.sybase)
-W: no module named openlp.core.lib.build_icon (top-level import by openlp.core.ui.servicemanager)
-W: no module named openlp.core.lib.translate (top-level import by openlp.core.ui.slidecontroller)
-W: no module named openlp.core.lib.Receiver (top-level import by openlp.plugins.songs.forms.songimportform)
-W: no module named openlp.core.lib.Receiver (top-level import by openlp.plugins.presentations.lib.mediaitem)
-W: no module named openlp.core.lib.translate (top-level import by openlp.core.ui.aboutdialog)
-W: no module named sqlalchemy.sql.insert (top-level import by sqlalchemy)
-W: no module named openlp.core.lib.str_to_bool (top-level import by openlp.core.ui.thememanager)
-W: no module named sqlalchemy.MetaData (top-level import by sqlalchemy.databases.sybase)
-W: no module named openlp.core.lib.translate (top-level import by openlp.plugins.bibles.lib.biblestab)
-W: no module named openlp.plugins.bibles.lib.BibleManager (top-level import by openlp.plugins.bibles.bibleplugin)
-W: no module named openlp.core.ui.SlideController (top-level import by openlp.core.ui.mainwindow)
-W: no module named MacOS (delayed import by platform)
-W: no module named openlp.core.lib.ThemeXML (top-level import by openlp.core.ui.thememanager)
-W: no module named cx_Oracle (delayed import by sqlalchemy.databases.oracle)
-W: no module named openlp.core.lib.Receiver (top-level import by openlp.core.ui.slidecontroller)
-W: no module named openlp.core.lib.translate (top-level import by openlp.core.ui.servicenotedialog)
-W: no module named sqlalchemy.sql.except_ (top-level import by sqlalchemy)
-W: no module named openlp.core.ui.AboutForm (top-level import by openlp.core.ui.mainwindow)
-W: no module named EasyDialogs (conditional import by getpass)
-W: no module named openlp.core.lib.SettingsManager (top-level import by openlp.core.lib.mediamanageritem)
-W: no module named sqlalchemy.orm.SessionExtension (top-level import by sqlalchemy.orm.session)
-W: no module named sqlalchemy.orm.relation (top-level import by openlp.plugins.bibles.lib.db)
-W: no module named openlp.plugins.songs.lib.VerseType (top-level import by openlp.plugins.songs.forms.editsongform)
-W: no module named openlp.core.utils.AppLocation (top-level import by openlp.plugins.bibles.lib.http)
-W: no module named sqlalchemy.sql.func (top-level import by sqlalchemy)
-W: no module named openlp.core.lib.translate (top-level import by openlp.core.utils.languagemanager)
-W: no module named openlp.core.lib.Receiver (top-level import by openlp.core.ui.mainwindow)
-W: no module named uno (conditional import by openlp.plugins.songs.lib.oooimport)
-W: no module named kinterbasdb (delayed import by sqlalchemy.databases.firebird)
-W: no module named multiprocessing.RLock (top-level import by multiprocessing.sharedctypes)
-W: no module named openlp.core.lib.translate (top-level import by openlp.core.ui.filerenameform)
-W: no module named sqlalchemy.ForeignKey (top-level import by sqlalchemy.databases.mssql)
-W: no module named openlp.core.lib.Renderer (top-level import by openlp.core.lib.rendermanager)
-W: no module named openlp.core.lib.translate (top-level import by openlp.plugins.songs.forms.songmaintenancedialog)
-W: no module named openlp.core.lib.check_item_selected (top-level import by openlp.plugins.songs.lib.mediaitem)
-W: no module named openlp.core.lib.build_icon (top-level import by openlp.core.lib.mediamanageritem)
-W: no module named openlp.core.ui.FileRenameForm (top-level import by openlp.core.ui.thememanager)
-W: no module named openlp.core.lib.translate (top-level import by openlp.plugins.songs.songsplugin)
-W: no module named openlp.core.lib.build_icon (top-level import by openlp.plugins.bibles.bibleplugin)
-W: no module named vms_lib (delayed, conditional import by platform)
-W: no module named openlp.core.lib.resize_image (top-level import by openlp.core.ui.slidecontroller)
-W: no module named openlp.core.lib.Receiver (top-level import by openlp.plugins.alerts.lib.alertsmanager)
-W: no module named openlp.core.lib.translate (top-level import by openlp.plugins.songusage.forms.songusagedetaildialog)
-W: no module named openlp.plugins.remotes.lib.RemoteTab (top-level import by openlp.plugins.remotes.remoteplugin)
-W: no module named openlp.core.ui.ServiceManager (top-level import by openlp.core.ui.mainwindow)
-W: no module named openlp.core.lib.SettingsManager (top-level import by openlp.plugins.songusage.forms.songusagedetailform)
-W: no module named openlp.core.ui.SettingsForm (top-level import by openlp.core.ui.mainwindow)
-W: no module named openlp.plugins.alerts.lib.AlertsTab (top-level import by openlp.plugins.alerts.alertsplugin)
-W: no module named xdg (delayed, conditional import by openlp.core.utils)
-W: no module named openlp.core.lib.build_icon (top-level import by openlp.plugins.custom.customplugin)
-W: no module named openlp.core.ui.AmendThemeForm (top-level import by openlp.core.ui.thememanager)
-W: no module named openlp.core.lib.ItemCapabilities (top-level import by openlp.plugins.songs.lib.mediaitem)
-W: no module named openlp.core.lib.ItemCapabilities (top-level import by openlp.plugins.custom.lib.mediaitem)
-W: no module named posix (delayed, conditional import by iu)
-W: no module named openlp.plugins.songs.lib.VerseType (top-level import by openlp.plugins.songs.forms.editversedialog)
-W: no module named multiprocessing.dummy.Process (delayed import by __main__)
-W: no module named openlp.core.lib.translate (top-level import by openlp.plugins.presentations.presentationplugin)
-W: no module named sqlalchemy.String (top-level import by sqlalchemy.databases.mssql)
-W: no module named xml.dom.EMPTY_PREFIX (top-level import by xml.dom.expatbuilder)
-W: no module named openlp.core.lib.MediaManagerItem (top-level import by openlp.plugins.custom.lib.mediaitem)
-W: no module named openlp.core.lib.ServiceItem (top-level import by openlp.core.lib.mediamanageritem)
-W: no module named openlp.core.lib.PluginManager (top-level import by openlp.core.ui.mainwindow)
-W: no module named multiprocessing.current_process (top-level import by multiprocessing.reduction)
-W: no module named openlp.core.lib.MediaManagerItem (top-level import by openlp.plugins.songs.lib.mediaitem)
-W: no module named openlp.core.lib.translate (top-level import by openlp.plugins.songs.forms.songbookform)
-W: no module named openlp.core.lib.Plugin (top-level import by openlp.plugins.presentations.presentationplugin)
-W: no module named xmltok (top-level import by pyexpat)
-W: no module named openlp.plugins.bibles.lib.SearchResults (top-level import by openlp.plugins.bibles.lib.http)
-W: no module named sqlalchemy.sql.delete (top-level import by sqlalchemy)
-W: no module named openlp.core.lib.Receiver (top-level import by openlp.plugins.songs.lib.oooimport)
-W: no module named _emx_link (conditional import by os)
-W: no module named openlp.core.lib.build_icon (top-level import by openlp.core.ui.aboutdialog)
-W: no module named openlp.core.lib.build_icon (top-level import by openlp.plugins.bibles.forms.bibleimportwizard)
-W: no module named openlp.core.lib.Plugin (top-level import by openlp.core.lib.pluginmanager)
-W: no module named openlp.plugins.songs.lib.SongsTab (top-level import by openlp.plugins.songs.songsplugin)
-W: no module named sqlalchemy.CHAR (top-level import by sqlalchemy.databases.sybase)
-W: no module named sqlalchemy.sql.collate (top-level import by sqlalchemy)
-W: no module named sqlalchemy.sql.outparam (top-level import by sqlalchemy)
-W: no module named openlp.core.utils.AppLocation (top-level import by openlp.core.lib.db)
-W: no module named openlp.core.ui.PluginForm (top-level import by openlp.core.ui.mainwindow)
-W: no module named gobject (top-level import by enchant.checker.GtkSpellCheckerDialog)
-W: no module named openlp.core.utils.VersionThread (top-level import by __main__)
-W: no module named openlp.core.lib.translate (top-level import by openlp.plugins.songs.forms.topicsform)
-W: no module named sqlalchemy.Integer (top-level import by sqlalchemy.databases.mssql)
-W: no module named openlp.core.lib.translate (top-level import by openlp.core.ui.exceptiondialog)
-W: no module named pwd (delayed, conditional import by distutils.util)
-W: no module named uno (conditional import by openlp.plugins.presentations.lib.impresscontroller)
-W: no module named openlp.core.lib.Receiver (top-level import by openlp.core.utils)
-W: no module named sqlalchemy.orm.class_mapper (top-level import by openlp.plugins.songs.lib.olpimport)
-W: no module named sqlalchemy.orm.relation (top-level import by openlp.plugins.songs.lib.olpimport)
-W: no module named readline (delayed import by pdb)
-W: no module named openlp.core.ui.MainDisplay (top-level import by openlp.core.lib.rendermanager)
-W: no module named openlp.core.lib.build_icon (top-level import by openlp.plugins.media.lib.mediaitem)
-W: no module named sqlalchemy.Table (top-level import by openlp.plugins.songusage.lib.db)
-W: no module named openlp.core.lib.translate (top-level import by openlp.plugins.alerts.alertsplugin)
-W: no module named openlp.core.lib.SettingsManager (top-level import by openlp.plugins.media.lib.mediaitem)
-W: no module named openlp.core.lib.BaseListWithDnD (top-level import by openlp.plugins.images.lib.mediaitem)
-W: no module named openlp.core.lib.Receiver (top-level import by openlp.plugins.bibles.forms.importwizardform)
-W: no module named openlp.core.lib.translate (top-level import by openlp.plugins.remotes.remoteplugin)
-W: no module named openlp.core.lib.build_icon (top-level import by openlp.plugins.images.imageplugin)
-W: no module named openlp.core.lib.SettingsTab (top-level import by openlp.plugins.alerts.lib.alertstab)
-W: no module named openlp.core.lib.translate (top-level import by openlp.plugins.songs.forms.editversedialog)
-W: no module named openlp.core.lib.Receiver (top-level import by openlp.plugins.songusage.songusageplugin)
-W: no module named openlp.core.ui.HideMode (top-level import by openlp.core.ui.slidecontroller)
-W: no module named sqlalchemy.sql.between (top-level import by sqlalchemy)
-W: no module named xml.dom.EMPTY_PREFIX (top-level import by xml.dom.minidom)
-W: no module named pysqlite2 (delayed import by sqlalchemy.databases.sqlite)
-W: no module named openlp.core.lib.SettingsManager (top-level import by openlp.core.ui.thememanager)
-W: no module named openlp.core.lib.translate (top-level import by openlp.plugins.custom.lib.customtab)
-W: no module named gtk (top-level import by enchant.checker.GtkSpellCheckerDialog)
-W: no module named xml.dom.EMPTY_NAMESPACE (top-level import by xml.dom.expatbuilder)
-W: no module named openlp.core.lib.Receiver (top-level import by openlp.plugins.remotes.lib.httpserver)
-W: no module named openlp.core.lib.translate (top-level import by openlp.plugins.songusage.forms.songusagedeleteform)
-W: no module named sqlalchemy.orm.scoped_session (top-level import by openlp.core.lib.db)
-W: no module named openlp.core.lib.clean_tags (top-level import by openlp.core.lib.serviceitem)
-W: no module named openlp.core.utils.get_filesystem_encoding (top-level import by openlp.core.ui.thememanager)
-W: no module named xml.dom.EMPTY_NAMESPACE (top-level import by xml.dom.minidom)
-W: no module named openlp.core.lib.build_icon (top-level import by openlp.core.lib.toolbar)
-W: no module named openlp.core.lib.build_icon (top-level import by openlp.plugins.remotes.remoteplugin)
-W: no module named sqlalchemy.exceptions (top-level import by sqlalchemy.orm.attributes)
-W: no module named sqlalchemy.ForeignKey (top-level import by sqlalchemy.databases.sybase)
-W: no module named openlp.core.lib.translate (top-level import by openlp.core.ui.servicemanager)
-W: no module named sqlalchemy.Column (top-level import by openlp.plugins.alerts.lib.db)
-W: no module named openlp.core.lib.SettingsTab (top-level import by openlp.core.ui.advancedtab)
-W: no module named AES (delayed, conditional import by archive)
-W: no module named openlp.core.lib.Receiver (top-level import by openlp.plugins.songs.forms.songmaintenanceform)
-W: no module named openlp.core.lib.context_menu_separator (top-level import by openlp.core.lib.mediamanageritem)
-W: no module named fcntl (top-level import by tempfile)
-W: no module named openlp.core.lib.translate (top-level import by openlp.core.ui.thememanager)
-W: no module named mx (top-level import by sqlalchemy.databases.mxODBC)
-W: no module named sqlalchemy.sql.union (top-level import by sqlalchemy)
-W: no module named openlp.plugins.songs.forms.TopicsForm (top-level import by openlp.plugins.songs.forms.songmaintenanceform)
-W: no module named openlp.core.lib.ItemCapabilities (top-level import by openlp.plugins.images.lib.mediaitem)
-W: no module named MacOS (delayed import by distutils.sysconfig)
-W: no module named openlp.core.lib.SpellTextEdit (top-level import by openlp.plugins.custom.forms.editcustomdialog)
-W: no module named ic (top-level import by webbrowser)
-W: no module named com (conditional import by openlp.plugins.presentations.lib.impresscontroller)
-W: no module named openlp.core.lib.translate (top-level import by openlp.plugins.media.mediaplugin)
-W: no module named openlp.core.lib.translate (top-level import by openlp.plugins.custom.forms.editcustomform)
-W: no module named openlp.core.lib.translate (top-level import by openlp.core.lib.spelltextedit)
-W: no module named openlp.core.lib.html_expands (top-level import by openlp.core.lib.spelltextedit)
-W: no module named openlp.core.lib.context_menu_action (top-level import by openlp.plugins.images.lib.mediaitem)
-W: no module named sqlalchemy.Column (top-level import by openlp.plugins.songs.lib.db)
-W: no module named py2exe (delayed import by enchant.tests)
-W: no module named openlp.plugins.songs.forms.AuthorsForm (top-level import by openlp.plugins.songs.forms.songmaintenanceform)
-W: no module named openlp.core.lib.translate (top-level import by openlp.plugins.songs.forms.authorsform)
-W: no module named openlp.plugins.remotes.lib.HttpServer (top-level import by openlp.plugins.remotes.remoteplugin)
-W: no module named sqlalchemy.Table (top-level import by openlp.plugins.bibles.lib.db)
-W: no module named openlp.core.lib.Plugin (top-level import by openlp.plugins.remotes.remoteplugin)
-W: no module named openlp.core.lib.translate (top-level import by openlp.core.ui.filerenamedialog)
-W: no module named openlp.core.lib.BaseListWithDnD (top-level import by openlp.plugins.media.lib.mediaitem)
-W: no module named sapdb (delayed import by sqlalchemy.databases.maxdb)
-W: no module named ctypes.cdll (delayed import by ctypes.util)
-W: no module named openlp.core.lib.translate (top-level import by openlp.plugins.presentations.lib.presentationtab)
-W: no module named openlp.core.lib.MediaManagerItem (top-level import by openlp.plugins.presentations.lib.mediaitem)
-W: no module named sqlalchemy.sql.text (top-level import by sqlalchemy)
-W: no module named openlp.core.lib.image_to_byte (top-level import by openlp.core.lib.renderer)
-W: no module named openlp.core.utils.AppLocation (top-level import by openlp.plugins.bibles.forms.importwizardform)
-W: no module named openlp.core.lib.image_to_byte (top-level import by openlp.core.ui.maindisplay)
-W: no module named iconv_codec (top-level import by BeautifulSoup)
-W: no module named openlp.plugins.songs.forms.SongBookForm (top-level import by openlp.plugins.songs.forms.songmaintenanceform)
-W: no module named sqlalchemy.sql.not_ (top-level import by sqlalchemy)
-W: no module named multiprocessing.Pipe (top-level import by multiprocessing.queues)
-W: no module named openlp.core.lib.check_item_selected (top-level import by openlp.plugins.images.lib.mediaitem)
-W: no module named openlp.core.lib.translate (top-level import by openlp.plugins.songusage.forms.songusagedetailform)
-W: no module named sqlalchemy.sql.subquery (top-level import by sqlalchemy)
-W: no module named openlp.core.lib.build_icon (top-level import by openlp.plugins.songs.songsplugin)
-W: no module named openlp.core.lib.translate (top-level import by openlp.plugins.songs.forms.editsongdialog)
-W: no module named openlp.core.lib.Plugin (top-level import by openlp.plugins.bibles.bibleplugin)
-W: no module named openlp.plugins.songs.forms.SongMaintenanceForm (top-level import by openlp.plugins.songs.lib.mediaitem)
-W: no module named xmlparse (top-level import by pyexpat)
-W: no module named sqlalchemy.sql.exists (top-level import by sqlalchemy)
-W: no module named sqlalchemy.sql.and_ (top-level import by openlp.plugins.songs.forms.songmaintenanceform)
-W: no module named multiprocessing.Process (top-level import by multiprocessing.pool)
-W: no module named openlp.core.lib.translate (top-level import by openlp.core.ui.settingsdialog)
-W: no module named sqlalchemy.exceptions (top-level import by openlp.core.lib.db)
-W: no module named sqlalchemy.sql.outerjoin (top-level import by sqlalchemy)
-W: no module named openlp.core.lib.build_icon (top-level import by openlp.plugins.songs.forms.editsongdialog)
-W: no module named openlp.plugins.custom.lib.CustomXMLParser (top-level import by openlp.plugins.custom.lib.mediaitem)
-W: no module named openlp.core.lib.build_icon (top-level import by openlp.plugins.custom.forms.editcustomdialog)
-W: no module named sqlalchemy.Integer (top-level import by sqlalchemy.databases.sybase)
-W: no module named sqlalchemy.exceptions (top-level import by sqlalchemy.orm.properties)
-W: no module named multiprocessing.current_process (top-level import by multiprocessing.managers)
-W: no module named openlp.core.ui.SplashScreen (top-level import by __main__)
-W: no module named multiprocessing.TimeoutError (top-level import by multiprocessing.dummy)
-W: no module named openlp.core.lib.SettingsManager (top-level import by openlp.plugins.songs.forms.songimportform)
-W: no module named xml.dom.XMLNS_NAMESPACE (top-level import by xml.dom.expatbuilder)
-W: no module named ctypes.c_int32 (delayed import by urllib)
-W: no module named openlp.core.lib.translate (top-level import by openlp.core.ui.amendthemedialog)
-W: no module named openlp.core.lib.build_icon (top-level import by openlp.core.lib.serviceitem)
-W: no module named openlp.core.utils.LanguageManager (top-level import by __main__)
-W: no module named sqlalchemy.orm.object_mapper (top-level import by sqlalchemy.orm.properties)
-W: no module named openlp.core.utils.AppLocation (top-level import by openlp.core.utils.languagemanager)
-W: no module named sqlalchemy.sql.literal_column (top-level import by sqlalchemy)
-W: no module named openlp.plugins.songs.lib.SongXMLParser (top-level import by openlp.plugins.songs.lib.mediaitem)
-W: no module named ctypes.c_char_p (delayed import by urllib)
-W: no module named openlp.core.lib.Plugin (top-level import by openlp.plugins.images.imageplugin)
-W: no module named openlp.core.lib.translate (top-level import by openlp.plugins.remotes.lib.remotetab)
-W: no module named openlp.core.lib.build_icon (top-level import by openlp.core.ui.mainwindow)
-W: no module named openlp.core.lib.translate (top-level import by openlp.plugins.bibles.lib.opensong)
-W: no module named openlp.core.lib.translate (top-level import by openlp.plugins.songs.forms.songimportform)
-W: no module named sqlalchemy.sql.select (top-level import by sqlalchemy)
-W: no module named openlp.core.lib.translate (top-level import by openlp.plugins.songs.forms.songbookdialog)
-W: no module named openlp.plugins.bibles.lib.BibleMediaItem (top-level import by openlp.plugins.bibles.bibleplugin)
-W: no module named PyQt4._qt (top-level import by PyQt4.QtNetwork)
-W: no module named openlp.core.lib.Plugin (top-level import by openlp.plugins.songs.songsplugin)
-W: no module named sqlalchemy.sql.case (top-level import by sqlalchemy)
-W: no module named wx (top-level import by enchant.checker.wxSpellCheckerDialog)
-W: no module named openlp.core.lib.build_icon (top-level import by openlp.plugins.alerts.alertsplugin)
-W: no module named com (conditional import by openlp.plugins.songs.lib.sofimport)
-W: no module named PyQt4._qt (top-level import by PyQt4)
-W: no module named SOCKS (top-level import by ftplib)
-W: no module named openlp.plugins.songusage.forms.SongUsageDetailForm (top-level import by openlp.plugins.songusage.songusageplugin)
-W: no module named sqlalchemy.sql.null (top-level import by sqlalchemy)
-W: no module named sqlalchemy.MetaData (top-level import by openlp.core.lib.db)
-W: no module named openlp.core.lib.ItemCapabilities (top-level import by openlp.core.ui.servicemanager)
-W: no module named openlp.plugins.custom.forms.EditCustomForm (top-level import by openlp.plugins.custom.customplugin)
-W: no module named org (delayed import by xml.sax)
-W: no module named openlp.core.lib.SpellTextEdit (top-level import by openlp.plugins.songs.forms.editversedialog)
-W: no module named sqlalchemy.orm.EXT_CONTINUE (top-level import by sqlalchemy.orm.scoping)
-W: no module named openlp.core.lib.build_lyrics_outline_css (top-level import by openlp.core.lib.renderer)
-W: no module named openlp.plugins.songs.lib.VerseType (top-level import by openlp.plugins.songs.forms.editverseform)
-W: no module named com (conditional import by openlp.plugins.songs.lib.oooimport)
-W: no module named openlp.core.lib.str_to_bool (top-level import by openlp.core.lib.theme)
-W: no module named sqlalchemy.sql.literal (top-level import by sqlalchemy)
-W: no module named termios (top-level import by getpass)
-W: no module named openlp.core.lib.build_lyrics_format_css (top-level import by openlp.core.lib.renderer)
-W: no module named ctypes.byref (delayed import by urllib)
-W: no module named openlp.plugins.custom.lib.CustomTab (top-level import by openlp.plugins.custom.customplugin)
-W: no module named openlp.core.lib.BaseListWithDnD (top-level import by openlp.plugins.songs.lib.mediaitem)
-W: no module named openlp.core.lib.build_icon (top-level import by openlp.plugins.images.lib.mediaitem)
-W: no module named openlp.plugins.bibles.lib.parse_reference (top-level import by openlp.plugins.bibles.lib.manager)
-W: no module named java (delayed import by platform)
-W: no module named openlp.core.ui.ServiceItemEditForm (top-level import by openlp.core.ui.servicemanager)
-W: no module named openlp.core.lib.translate (top-level import by openlp.plugins.custom.customplugin)
-W: no module named openlp.core.lib.ThemeLevel (top-level import by openlp.core.lib.rendermanager)
-W: no module named openlp.core.lib.translate (top-level import by openlp.plugins.bibles.lib.db)
-W: no module named _xmlrpclib (top-level import by xmlrpclib)
-W: no module named openlp.core.lib.SettingsManager (top-level import by openlp.plugins.presentations.lib.mediaitem)
-W: no module named openlp.plugins.media.lib.MediaMediaItem (top-level import by openlp.plugins.media.mediaplugin)
-W: no module named openlp.plugins.custom.lib.CustomXMLBuilder (top-level import by openlp.plugins.custom.forms.editcustomform)
-W: no module named rourl2path (conditional import by urllib)
-W: no module named pwd (delayed import by webbrowser)
-W: no module named openlp.core.lib.Receiver (top-level import by openlp.core.ui.themestab)
-W: no module named PyQt4._qt (top-level import by PyQt4.QtWebKit)
-W: no module named sqlalchemy.orm.class_mapper (delayed, conditional import by sqlalchemy.orm.interfaces)
-W: no module named PyQt4._qt (top-level import by PyQt4.phonon)
-W: no module named openlp.core.ui.HideMode (top-level import by openlp.plugins.presentations.lib.messagelistener)
-W: no module named openlp.plugins.songusage.forms.SongUsageDeleteForm (top-level import by openlp.plugins.songusage.songusageplugin)
-W: no module named openlp.core.lib.context_menu_separator (top-level import by openlp.core.ui.thememanager)
-W: no module named openlp.core.lib.translate (top-level import by openlp.plugins.media.lib.mediaitem)
-W: no module named openlp.core.lib.translate (top-level import by openlp.core.ui.plugindialog)
-W: no module named fcntl (conditional import by subprocess)
-W: no module named openlp.core.lib.BaseListWithDnD (top-level import by openlp.plugins.bibles.lib.mediaitem)
-W: no module named openlp.core.lib.PluginStatus (top-level import by openlp.core.lib.pluginmanager)
-W: no module named openlp.core.lib.Receiver (top-level import by openlp.plugins.songs.forms.editsongform)
-W: no module named openlp.core.ui.ScreenList (top-level import by __main__)
-W: no module named sqlalchemy.or_ (top-level import by openlp.plugins.bibles.lib.db)
-W: no module named openlp.core.lib.translate (top-level import by openlp.plugins.songs.forms.editsongform)
-W: no module named openlp.plugins.songs.forms.ImportWizardForm (top-level import by openlp.plugins.songs.lib.mediaitem)
-W: no module named openlp.core.lib.check_item_selected (top-level import by openlp.core.ui.thememanager)
-W: no module named openlp.core.ui.ThemeManager (top-level import by openlp.core.ui.mainwindow)
-W: no module named pyodbc (delayed, conditional import by sqlalchemy.databases.mssql)
-W: no module named openlp.core.utils.AppLocation (top-level import by openlp.core.ui.servicemanager)
-W: no module named openlp.core.lib.translate (top-level import by openlp.core.lib.mediamanageritem)
-W: no module named openlp.core.lib.Receiver (top-level import by openlp.plugins.bibles.lib.biblestab)
-W: no module named openlp.core.lib.translate (top-level import by openlp.plugins.songusage.songusageplugin)
-W: no module named multiprocessing.active_children (top-level import by multiprocessing.managers)
-W: no module named openlp.plugins.songs.forms.EditSongForm (top-level import by openlp.plugins.songs.lib.mediaitem)
-W: no module named email.Generator (delayed import by email.message)
-W: no module named mx (delayed import by sqlalchemy.databases.mxODBC)
-W: no module named sqlalchemy.sql.or_ (top-level import by sqlalchemy)
-W: no module named sqlalchemy.Table (top-level import by openlp.plugins.custom.lib.db)
-W: no module named sqlalchemy.Table (top-level import by sqlalchemy.databases.sybase)
-W: no module named openlp.core.lib.get_text_file_string (top-level import by openlp.core.ui.thememanager)
-W: no module named sqlalchemy.orm.object_session (top-level import by sqlalchemy.orm.scoping)
-W: no module named openlp.core.lib.MediaManagerItem (top-level import by openlp.plugins.bibles.lib.mediaitem)
-W: no module named sqlalchemy.Table (top-level import by sqlalchemy.databases.mssql)
-W: no module named openlp.core.utils.AppLocation (top-level import by openlp.core.ui.mainwindow)
-W: no module named openlp.core.lib.translate (top-level import by openlp.plugins.bibles.forms.bibleimportwizard)
-W: no module named openlp.core.lib.resize_image (top-level import by openlp.core.lib.renderer)
-W: no module named pymssql (delayed import by sqlalchemy.databases.mssql)
-W: no module named sqlalchemy.orm.sessionmaker (top-level import by openlp.plugins.songs.lib.olpimport)
-W: no module named openlp.core.lib.context_menu_action (top-level import by openlp.core.ui.thememanager)
-W: no module named openlp.core.lib.expand_tags (top-level import by openlp.core.lib.serviceitem)
-W: no module named gestalt (delayed import by platform)
-W: no module named enchant.checker.SpellChecker (top-level import by enchant.checker.CmdLineChecker)
-W: no module named openlp.core.lib.translate (top-level import by openlp.core.ui.themestab)
-W: no module named openlp.core.lib.translate (top-level import by openlp.plugins.songs.lib.olp1import)
-W: no module named openlp.core.lib.Receiver (top-level import by openlp.plugins.presentations.lib.messagelistener)
-W: no module named sqlalchemy.exceptions (top-level import by sqlalchemy.orm.interfaces)
-W: no module named sqlalchemy.orm.object_mapper (top-level import by sqlalchemy.orm.query)
-W: no module named sqlalchemy.sql.distinct (top-level import by sqlalchemy)
-W: no module named openlp.core.lib.context_menu_action (top-level import by openlp.plugins.media.lib.mediaitem)
-W: no module named sqlalchemy.sql.extract (top-level import by sqlalchemy)
-W: no module named sqlalchemy.Column (top-level import by openlp.plugins.bibles.lib.db)
-W: no module named psycopg2 (delayed import by sqlalchemy.databases.postgres)
-W: no module named enchant.checker.SpellChecker (delayed import by enchant.checker.GtkSpellCheckerDialog)
-W: no module named clr (conditional import by adodbapi.adodbapi)
-W: no module named openlp.core.lib.translate (top-level import by openlp.plugins.images.lib.mediaitem)
-W: no module named openlp.plugins.custom.lib.CustomXMLParser (top-level import by openlp.plugins.custom.forms.editcustomform)
-W: no module named openlp.core.theme.Theme (top-level import by openlp.core.ui.thememanager)
-W: no module named openlp.core.lib.Receiver (top-level import by openlp.plugins.custom.forms.editcustomform)
-W: no module named openlp.core.lib.Receiver (top-level import by openlp.plugins.songs.lib.mediaitem)
-W: no module named openlp.core.utils.AppLocation (top-level import by openlp.core.lib.settingsmanager)
-W: no module named openlp.core.lib.Receiver (top-level import by __main__)
-W: no module named openlp.core.lib.SettingsManager (top-level import by openlp.plugins.bibles.lib.manager)
-W: no module named org (top-level import by pickle)
-W: no module named enchant.DictNotFoundError (top-level import by openlp.core.lib.spelltextedit)
-W: no module named sqlalchemy.sql.except_all (top-level import by sqlalchemy)
-W: no module named openlp.plugins.presentations.lib.PresentationTab (top-level import by openlp.plugins.presentations.presentationplugin)
-W: no module named sqlalchemy.sql.cast (top-level import by sqlalchemy)
-W: no module named sqlalchemy.orm.relation (top-level import by openlp.plugins.songs.lib.db)
-W: no module named openlp.core.lib.build_icon (top-level import by openlp.core.ui.settingsdialog)
-W: no module named openlp.core.utils.LanguageManager (top-level import by openlp.core.ui.mainwindow)
-W: no module named openlp.core.lib.ItemCapabilities (top-level import by openlp.plugins.media.lib.mediaitem)
-W: no module named sqlalchemy.sql.intersect (top-level import by sqlalchemy)
-W: no module named openlp.core.lib.translate (top-level import by openlp.plugins.songs.lib.songimport)
-W: no module named sqlalchemy.orm.class_mapper (top-level import by sqlalchemy.orm.scoping)
-W: no module named sqlalchemy.exceptions (top-level import by sqlalchemy.orm.util)
-W: no module named openlp.core.lib.translate (top-level import by openlp.plugins.songs.lib.opensongimport)
-W: no module named openlp.core.lib.SettingsTab (top-level import by openlp.plugins.bibles.lib.biblestab)
-W: no module named openlp.core.lib.translate (top-level import by openlp.core.ui.aboutform)
-W: no module named openlp.plugins.custom.lib.CustomMediaItem (top-level import by openlp.plugins.custom.customplugin)
-W: no module named sqlalchemy.orm.scoped_session (top-level import by openlp.plugins.songs.lib.olpimport)
-W: no module named openlp.core.lib.translate (top-level import by openlp.core.ui.amendthemeform)
-W: no module named sqlalchemy.engine.engine_from_config (top-level import by sqlalchemy)
-W: no module named openlp.core.lib.SettingsTab (top-level import by openlp.core.ui.themestab)
-W: no module named openlp.core.lib.OpenLPToolbar (top-level import by openlp.core.ui.servicemanager)
-W: no module named openlp.core.lib.Receiver (top-level import by openlp.core.ui.maindisplay)
-W: no module named openlp.core.lib.PluginStatus (top-level import by openlp.core.ui.pluginform)
-W: no module named openlp.core.lib.Receiver (top-level import by openlp.plugins.bibles.lib.http)
-W: no module named openlp.core.utils.AppLocation (top-level import by openlp.plugins.remotes.lib.httpserver)
-W: no module named sqlalchemy.Table (top-level import by openlp.plugins.songs.lib.db)
-W: no module named openlp.core.lib.translate (top-level import by openlp.core.utils)
-W: no module named openlp.core.lib.RenderManager (top-level import by openlp.core.ui.mainwindow)
-W: no module named openlp.core.lib.Plugin (top-level import by openlp.plugins.alerts.alertsplugin)
-W: no module named openlp.core.lib.Receiver (top-level import by openlp.core.lib.plugin)
-W: no module named sqlalchemy.ForeignKey (top-level import by openlp.plugins.bibles.lib.db)
-W: no module named openlp.plugins.songs.lib.SongMediaItem (top-level import by openlp.plugins.songs.songsplugin)
-W: no module named sqlalchemy.Index (top-level import by openlp.plugins.songs.lib.db)
-W: no module named multiprocessing.TimeoutError (top-level import by multiprocessing.pool)
-W: no module named openlp.core.lib.build_icon (top-level import by openlp.plugins.songusage.forms.songusagedetaildialog)
-W: no module named enchant.DictWithPWL (delayed import by enchant.checker.tests)
-W: no module named openlp.core.lib.translate (top-level import by openlp.plugins.songs.lib.songstab)
-W: no module named openlp.core.ui.AdvancedTab (top-level import by openlp.core.ui.settingsform)
-W: no module named MySQLdb (delayed import by sqlalchemy.databases.mysql)
-W: no module named openlp.plugins.presentations.lib.PresentationMediaItem (top-level import by openlp.plugins.presentations.presentationplugin)
-W: no module named openlp.plugins.alerts.forms.AlertForm (top-level import by openlp.plugins.alerts.alertsplugin)
-W: no module named ctypes.c_int (delayed import by urllib)
-W: no module named xml.dom.XML_NAMESPACE (delayed import by xml.dom.pulldom)
-W: no module named ctypes.c_void_p (delayed import by urllib)
-W: no module named openlp.core.utils.AppLocation (top-level import by openlp.plugins.bibles.lib.osis)
-W: no module named sqlalchemy.create_engine (top-level import by openlp.core.lib.db)
-W: no module named win32com.client._get_good_object_ (top-level import by win32com.client.util)
-W: no module named openlp.core.ui.MainDisplay (top-level import by openlp.core.ui.slidecontroller)
-W: no module named openlp.core.lib.resize_image (top-level import by openlp.plugins.presentations.lib.presentationcontroller)
-W: no module named openlp.core.lib.SettingsTab (top-level import by openlp.plugins.remotes.lib.remotetab)
-W: no module named openlp.core.ui.MediaDockManager (top-level import by openlp.core.ui.mainwindow)
-W: no module named sqlalchemy.exceptions (top-level import by sqlalchemy.orm.session)
-W: no module named sqlalchemy.Column (top-level import by sqlalchemy.databases.mssql)
-W: no module named openlp.core.lib.build_icon (top-level import by openlp.plugins.songs.forms.editversedialog)
-W: no module named multiprocessing.Process (top-level import by multiprocessing.managers)
-W: no module named openlp.core.lib.Receiver (top-level import by openlp.plugins.presentations.lib.presentationcontroller)
-W: no module named openlp.core.lib.translate (top-level import by openlp.plugins.songs.lib.mediaitem)
-W: no module named openlp.core.lib.translate (top-level import by openlp.plugins.custom.forms.editcustomdialog)
-W: no module named openlp.core.lib.translate (top-level import by openlp.plugins.alerts.lib.alertsmanager)
-W: no module named sgmlop (top-level import by xmlrpclib)
-W: no module named MacOS (conditional import by py_compile)
-W: no module named multiprocessing.cpu_count (top-level import by multiprocessing.dummy)
-W: no module named _dummy_threading (top-level import by dummy_threading)
-W: no module named openlp.core.lib.translate (top-level import by openlp.core.ui.mainwindow)
-W: no module named openlp.core.lib.translate (top-level import by openlp.plugins.songs.forms.songmaintenanceform)
-W: no module named openlp.plugins.presentations.lib.PresentationController (top-level import by openlp.plugins.presentations.presentationplugin)
-W: no module named openlp.core.lib.OpenLPToolbar (top-level import by openlp.core.lib.mediamanageritem)
-W: no module named sqlalchemy.sql.union_all (top-level import by sqlalchemy)
-W: no module named openlp.core.lib.Receiver (top-level import by openlp.plugins.bibles.lib.opensong)
-W: no module named openlp.core.lib.ItemCapabilities (top-level import by openlp.plugins.bibles.lib.mediaitem)
-W: no module named openlp.core.lib.Receiver (top-level import by openlp.plugins.bibles.lib.osis)
-W: no module named openlp.core.lib.Receiver (top-level import by openlp.core.ui.settingsform)
-W: no module named enchant.tokenize.get_tokenizer (top-level import by enchant.checker)
-W: no module named openlp.core.utils.AppLocation (top-level import by openlp.plugins.bibles.lib.manager)
-W: no module named org (top-level import by copy)
-W: no module named openlp.core.lib.Receiver (top-level import by openlp.core.ui.thememanager)
-W: no module named openlp.core.lib.SettingsManager (top-level import by openlp.core.ui.servicemanager)
-W: no module named sqlalchemy.MetaData (top-level import by openlp.plugins.songs.lib.olpimport)
-W: no module named openlp.core.lib.build_icon (top-level import by openlp.plugins.songs.forms.songmaintenancedialog)
-W: no module named sqlalchemy.sql.select (top-level import by sqlalchemy.databases.mssql)
-W: no module named openlp.core.lib.SettingsManager (top-level import by openlp.plugins.bibles.forms.importwizardform)
-W: no module named multiprocessing.current_process (top-level import by multiprocessing.connection)
-W: no module named sqlalchemy.orm.sessionmaker (top-level import by openlp.core.lib.db)
-W: no module named sqlalchemy.sql.desc (top-level import by sqlalchemy)
-W: no module named openlp.core.lib.translate (top-level import by openlp.plugins.songusage.forms.songusagedeletedialog)
-W: no module named openlp.core.lib.Receiver (top-level import by openlp.plugins.bibles.lib.mediaitem)
-W: no module named ctypes.cdll (delayed import by urllib)
-W: no module named openlp.core.lib.translate (top-level import by openlp.plugins.songs.lib)
-W: no module named openlp.core.lib.build_icon (top-level import by openlp.plugins.media.mediaplugin)
-W: no module named openlp.core.lib.SettingsTab (top-level import by openlp.plugins.presentations.lib.presentationtab)
-W: no module named MySQLdb (delayed, conditional import by sqlalchemy.databases.mysql)
-W: no module named openlp.core.lib.build_icon (top-level import by openlp.plugins.presentations.lib.mediaitem)
-W: no module named openlp.core.lib.MediaManagerItem (top-level import by openlp.plugins.media.lib.mediaitem)
-W: no module named sqlalchemy.orm.object_session (top-level import by sqlalchemy.orm.dynamic)
-W: no module named sqlalchemy.sql.modifier (top-level import by sqlalchemy)
-W: no module named _xmlplus (top-level import by xml)
-W: no module named sqlalchemy.Column (top-level import by openlp.plugins.songusage.lib.db)
-W: no module named openlp.core.lib.translate (top-level import by openlp.core.ui.advancedtab)
-W: no module named sqlalchemy.sql.and_ (top-level import by sqlalchemy)
-W: no module named sqlalchemy.MetaData (top-level import by sqlalchemy.databases.mssql)
-W: no module named sqlalchemy.exceptions (top-level import by sqlalchemy.orm.dependency)
-W: no module named openlp.core.lib.ThemeLevel (top-level import by openlp.core.ui.themestab)
-W: no module named openlp.core.lib.Receiver (top-level import by openlp.plugins.presentations.lib.presentationtab)
-W: no module named openlp.core.utils.get_images_filter (top-level import by openlp.core.ui.amendthemeform)
-W: no module named openlp.core.utils.AppLocation (top-level import by openlp.plugins.presentations.presentationplugin)
-W: no module named openlp.plugins.presentations.lib.MessageListener (top-level import by openlp.plugins.presentations.lib.mediaitem)
-W: no module named openlp.plugins.bibles.forms.ImportWizardForm (top-level import by openlp.plugins.bibles.lib.mediaitem)
-W: no module named openlp.core.utils.AppLocation (top-level import by __main__)
-W: no module named sqlalchemy.ForeignKey (top-level import by openlp.plugins.songs.lib.db)
-W: no module named openlp.core.lib.OpenLPToolbar (top-level import by openlp.core.ui.thememanager)
-W: no module named ctypes.cdll (conditional import by openlp.plugins.presentations.lib.pptviewcontroller)
-W: no module named pwd (delayed import by getpass)
-W: no module named sqlalchemy.sql.and_ (top-level import by openlp.plugins.songusage.forms.songusagedetailform)
-W: no module named openlp.core.lib.build_icon (top-level import by openlp.core.ui.amendthemedialog)
-W: no module named openlp.core.lib.build_icon (top-level import by openlp.plugins.songs.forms.songimportwizard)
-W: no module named openlp.core.lib.translate (top-level import by openlp.core.ui.serviceitemeditdialog)
-W: no module named openlp.core.lib.resize_image (top-level import by openlp.core.ui.maindisplay)
-W: no module named openlp.core.lib.BaseListWithDnD (top-level import by openlp.plugins.custom.lib.mediaitem)
-W: no module named openlp.core.lib.translate (top-level import by openlp.plugins.songs.forms.topicsdialog)
-W: no module named PyQt4._qt (top-level import by PyQt4.QtGui)
-W: no module named sqlalchemy.sql.update (top-level import by sqlalchemy)
-W: no module named multiprocessing.current_process (delayed, conditional import by logging)
-W: no module named multiprocessing.Pool (top-level import by multiprocessing.managers)
-W: no module named sqlalchemy.create_engine (delayed, conditional import by sqlalchemy.schema)
-W: no module named openlp.core.lib.translate (top-level import by openlp.plugins.bibles.forms.importwizardform)
-W: no module named openlp.core.lib.context_menu_action (top-level import by openlp.core.lib.mediamanageritem)
-W: no module named posix (conditional import by os)
-W: no module named sqlalchemy.sql.bindparam (top-level import by sqlalchemy)
-W: no module named xml.dom.DOMImplementation (top-level import by xml.dom.domreg)
-W: no module named openlp.core.utils.add_actions (top-level import by openlp.core.ui.mainwindow)
-W: no module named sqlalchemy.create_engine (top-level import by openlp.plugins.songs.lib.olpimport)
-W: no module named multiprocessing.cpu_count (top-level import by multiprocessing.pool)
-W: no module named multiprocessing.AuthenticationError (top-level import by multiprocessing.connection)
-W: no module named openlp.core.ui.ThemesTab (top-level import by openlp.core.ui.settingsform)
-W: no module named openlp.core.lib.check_item_selected (top-level import by openlp.plugins.media.lib.mediaitem)
-W: no module named sqlalchemy.orm.class_mapper (top-level import by openlp.plugins.bibles.lib.db)
-W: no module named sqlalchemy.String (top-level import by sqlalchemy.databases.sybase)
-W: no module named openlp.core.lib.context_menu_action (top-level import by openlp.core.ui.servicemanager)
-W: no module named openlp.core.utils.AppLocation (top-level import by openlp.plugins.images.lib.mediaitem)
-W: no module named pwd (delayed, conditional import by posixpath)
-W: no module named sqlalchemy.exceptions (top-level import by sqlalchemy.orm.strategies)
-W: no module named mx (top-level import by adodbapi.adodbapi)
-W: no module named sqlalchemy.sql.alias (top-level import by sqlalchemy)
-W: no module named openlp.core.lib.translate (top-level import by openlp.plugins.songs.forms.authorsdialog)
-W: no module named sqlalchemy.Table (top-level import by openlp.plugins.alerts.lib.db)
-W: no module named openlp.core.lib.translate (top-level import by openlp.plugins.bibles.lib.mediaitem)
-W: no module named openlp.core.lib.translate (top-level import by openlp.plugins.images.imageplugin)
-W: no module named sqlalchemy.orm.mapperlib (delayed import by sqlalchemy.orm.util)
-W: no module named openlp.core.lib.ServiceItem (top-level import by openlp.core.lib.rendermanager)
-W: no module named openlp.core.lib.OpenLPDockWidget (top-level import by openlp.core.ui.mainwindow)
-W: no module named openlp.core.lib.translate (top-level import by openlp.plugins.songs.forms.songimportwizard)
-W: no module named openlp.core.lib.Plugin (top-level import by openlp.plugins.songusage.songusageplugin)
-W: no module named openlp.core.utils.AppLocation (top-level import by openlp.plugins.presentations.lib.presentationcontroller)
-W: no module named openlp.core.lib.context_menu_action (top-level import by openlp.core.lib.spelltextedit)
-W: no module named openlp.core.lib.build_icon (top-level import by openlp.core.ui.thememanager)
-W: no module named openlp.core.lib.check_item_selected (top-level import by openlp.plugins.presentations.lib.mediaitem)
-W: no module named openlp.core.lib.translate (top-level import by openlp.core.ui.pluginform)
-W: no module named enchant.checker.SpellChecker (delayed import by enchant.checker.wxSpellCheckerDialog)
-W: no module named sqlalchemy.DefaultClause (top-level import by sqlalchemy.databases.sqlite)
-W: no module named openlp.core.lib.ServiceItem (top-level import by openlp.core.ui.servicemanager)
-W: no module named openlp.core.lib.ItemCapabilities (top-level import by openlp.core.ui.slidecontroller)
-W: no module named openlp.core.utils.get_images_filter (top-level import by openlp.plugins.images.lib.mediaitem)
-W: no module named pyodbc (delayed import by sqlalchemy.databases.mssql)
-W: no module named openlp.core.lib.OpenLPToolbar (top-level import by openlp.core.ui.slidecontroller)
-W: no module named System (conditional import by adodbapi.adodbapi)
-W: no module named openlp.core.lib.SettingsTab (top-level import by openlp.plugins.custom.lib.customtab)
-W: no module named openlp.core.lib.Receiver (top-level import by openlp.plugins.bibles.lib.csvbible)
-W: no module named openlp.core.lib.translate (top-level import by openlp.core.ui.generaltab)
-W: no module named openlp.core.lib.ThemeLevel (top-level import by openlp.core.ui.servicemanager)
-W: no module named sqlalchemy.exceptions (top-level import by sqlalchemy.orm.scoping)
-W: no module named openlp.core.lib.translate (top-level import by openlp.plugins.alerts.forms.alertform)
-W: no module named mypyodbc (delayed import by sqlalchemy.databases.sybase)
-W: no module named sqlalchemy.sql.intersect_all (top-level import by sqlalchemy)
-W: no module named openlp.core.lib.translate (top-level import by openlp.plugins.presentations.lib.mediaitem)
-W: __all__ is built strangely at line 0 - dummy_threading (C:\Python26\lib\dummy_threading.pyc)
-W: delayed  exec statement detected at line 0 - bdb (C:\Python26\lib\bdb.pyc)
-W: delayed  eval hack detected at line 0 - bdb (C:\Python26\lib\bdb.pyc)
-W: delayed  eval hack detected at line 0 - bdb (C:\Python26\lib\bdb.pyc)
-W: delayed  __import__ hack detected at line 0 - optparse (C:\Python26\lib\optparse.pyc)
-W: delayed conditional __import__ hack detected at line 0 - pkg_resources (build/bdist.linux-i686/egg/pkg_resources.pyc)
-W: delayed conditional exec statement detected at line 0 - pkg_resources (build/bdist.linux-i686/egg/pkg_resources.pyc)
-W: delayed conditional __import__ hack detected at line 0 - pkg_resources (build/bdist.linux-i686/egg/pkg_resources.pyc)
-W: delayed  __import__ hack detected at line 0 - pkg_resources (build/bdist.linux-i686/egg/pkg_resources.pyc)
-W: delayed conditional __import__ hack detected at line 0 - doctest (C:\Python26\lib\doctest.pyc)
-W: delayed  exec statement detected at line 0 - doctest (C:\Python26\lib\doctest.pyc)
-W: delayed conditional __import__ hack detected at line 0 - doctest (C:\Python26\lib\doctest.pyc)
-W: __all__ is built strangely at line 0 - sqlalchemy.orm.interfaces (C:\Python26\lib\site-packages\sqlalchemy-0.5.8-py2.6.egg\sqlalchemy\orm\interfaces.pyc)
-W: __all__ is built strangely at line 0 - tokenize (C:\Python26\lib\tokenize.pyc)
-W: __all__ is built strangely at line 0 - sqlalchemy.engine (C:\Python26\lib\site-packages\sqlalchemy-0.5.8-py2.6.egg\sqlalchemy\engine\__init__.pyc)
-W: delayed  __import__ hack detected at line 0 - pickle (C:\Python26\lib\pickle.pyc)
-W: delayed  __import__ hack detected at line 0 - pickle (C:\Python26\lib\pickle.pyc)
-W: top-level conditional exec statement detected at line 0 - sqlalchemy.sql.util (C:\Python26\lib\site-packages\sqlalchemy-0.5.8-py2.6.egg\sqlalchemy\sql\util.pyc)
-W: top-level conditional exec statement detected at line 0 - sqlalchemy.sql.util (C:\Python26\lib\site-packages\sqlalchemy-0.5.8-py2.6.egg\sqlalchemy\sql\util.pyc)
-W: delayed conditional __import__ hack detected at line 0 - openlp.core.lib.pluginmanager (c:\Documents and Settings\raoul\My Documents\My Projects\openlp\movements\openlp\core\lib\pluginmanager.pyc)
-W: delayed conditional exec statement detected at line 0 - multiprocessing.sharedctypes (C:\Python26\lib\multiprocessing\sharedctypes.pyc)
-W: delayed  __import__ hack detected at line 0 - encodings (C:\Python26\lib\encodings\__init__.pyc)
-W: __all__ is built strangely at line 0 - sqlalchemy.databases.mysql (C:\Python26\lib\site-packages\sqlalchemy-0.5.8-py2.6.egg\sqlalchemy\databases\mysql.pyc)
-W: delayed  exec statement detected at line 0 - sqlalchemy.orm.attributes (C:\Python26\lib\site-packages\sqlalchemy-0.5.8-py2.6.egg\sqlalchemy\orm\attributes.pyc)
-W: delayed conditional __import__ hack detected at line 0 - openlp.plugins.presentations.presentationplugin (c:\Documents and Settings\raoul\My Documents\My Projects\openlp\movements\openlp\plugins\presentations\presentationplugin.pyc)
-W: delayed  __import__ hack detected at line 0 - enchant.tokenize (C:\Python26\lib\site-packages\enchant\tokenize\__init__.pyc)
-W: __all__ is built strangely at line 0 - multiprocessing (C:\Python26\lib\multiprocessing\__init__.pyc)
-W: __all__ is built strangely at line 0 - dis (C:\Python26\lib\dis.pyc)
-W: __all__ is built strangely at line 0 - sqlalchemy.databases (C:\Python26\lib\site-packages\sqlalchemy-0.5.8-py2.6.egg\sqlalchemy\databases\__init__.pyc)
-W: delayed  __import__ hack detected at line 0 - win32com.server.policy (C:\Python26\lib\site-packages\win32com\server\policy.pyc)
-W: __all__ is built strangely at line 0 - sqlalchemy.orm.mapper (C:\Python26\lib\site-packages\sqlalchemy-0.5.8-py2.6.egg\sqlalchemy\orm\mapper.pyc)
-W: top-level  exec statement detected at line 0 - hashlib (C:\Python26\lib\hashlib.pyc)
-W: top-level conditional exec statement detected at line 0 - hashlib (C:\Python26\lib\hashlib.pyc)
-W: delayed conditional eval hack detected at line 0 - warnings (C:\Python26\lib\warnings.pyc)
-W: delayed conditional __import__ hack detected at line 0 - warnings (C:\Python26\lib\warnings.pyc)
-W: delayed  exec statement detected at line 0 - cgi (C:\Python26\lib\cgi.pyc)
-W: delayed  __import__ hack detected at line 0 - email (C:\Python26\lib\email\__init__.pyc)
-W: __all__ is built strangely at line 0 - sqlalchemy.orm (C:\Python26\lib\site-packages\sqlalchemy-0.5.8-py2.6.egg\sqlalchemy\orm\__init__.pyc)
-W: delayed  __import__ hack detected at line 0 - ctypes (C:\Python26\lib\ctypes\__init__.pyc)
-W: delayed  __import__ hack detected at line 0 - ctypes (C:\Python26\lib\ctypes\__init__.pyc)
-W: delayed conditional __import__ hack detected at line 0 - xml.dom.domreg (C:\Python26\lib\xml\dom\domreg.pyc)
-W: delayed  exec statement detected at line 0 - pdb (C:\Python26\lib\pdb.pyc)
-W: delayed conditional eval hack detected at line 0 - pdb (C:\Python26\lib\pdb.pyc)
-W: delayed  eval hack detected at line 0 - pdb (C:\Python26\lib\pdb.pyc)
-W: delayed conditional eval hack detected at line 0 - pdb (C:\Python26\lib\pdb.pyc)
-W: delayed  eval hack detected at line 0 - pdb (C:\Python26\lib\pdb.pyc)
-W: delayed conditional __import__ hack detected at line 0 - unittest (C:\Python26\lib\unittest.pyc)
-W: delayed conditional __import__ hack detected at line 0 - unittest (C:\Python26\lib\unittest.pyc)
-W: delayed conditional __import__ hack detected at line 0 - pkgutil (C:\Python26\lib\pkgutil.pyc)
-W: delayed conditional __import__ hack detected at line 0 - pkgutil (C:\Python26\lib\pkgutil.pyc)
-W: __all__ is built strangely at line 0 - sqlalchemy.orm.properties (C:\Python26\lib\site-packages\sqlalchemy-0.5.8-py2.6.egg\sqlalchemy\orm\properties.pyc)
-W: delayed conditional exec statement detected at line 0 - iu (c:\Documents and Settings\raoul\My Documents\My Projects\pyinstaller\iu.pyc)
-W: delayed conditional exec statement detected at line 0 - iu (c:\Documents and Settings\raoul\My Documents\My Projects\pyinstaller\iu.pyc)
-W: __all__ is built strangely at line 0 - sqlalchemy.sql (C:\Python26\lib\site-packages\sqlalchemy-0.5.8-py2.6.egg\sqlalchemy\sql\__init__.pyc)
-W: __all__ is built strangely at line 0 - collections (C:\Python26\lib\collections.pyc)
-W: delayed  exec statement detected at line 0 - collections (C:\Python26\lib\collections.pyc)
-W: delayed  __import__ hack detected at line 0 - sqlalchemy.engine.url (C:\Python26\lib\site-packages\sqlalchemy-0.5.8-py2.6.egg\sqlalchemy\engine\url.pyc)
-W: delayed  exec statement detected at line 0 - multiprocessing.managers (C:\Python26\lib\multiprocessing\managers.pyc)
-W: delayed  exec statement detected at line 0 - socket (C:\Python26\lib\socket.pyc)
-W: delayed conditional __import__ hack detected at line 0 - win32com.client.gencache (C:\Python26\lib\site-packages\win32com\client\gencache.pyc)
-W: delayed  __import__ hack detected at line 0 - win32com.client.gencache (C:\Python26\lib\site-packages\win32com\client\gencache.pyc)
-W: delayed  eval hack detected at line 0 - os (C:\Python26\lib\os.pyc)
-W: __all__ is built strangely at line 0 - __future__ (C:\Python26\lib\__future__.pyc)
-W: delayed  __import__ hack detected at line 0 - win32com.client.makepy (C:\Python26\lib\site-packages\win32com\client\makepy.pyc)
-W: delayed  exec statement detected at line 0 - win32com.client.dynamic (C:\Python26\lib\site-packages\win32com\client\dynamic.pyc)
-W: __all__ is built strangely at line 0 - sqlalchemy (C:\Python26\lib\site-packages\sqlalchemy-0.5.8-py2.6.egg\sqlalchemy\__init__.pyc)
-W: delayed  __import__ hack detected at line 0 - xml.sax (C:\Python26\lib\xml\sax\__init__.pyc)
-W: delayed  eval hack detected at line 0 - gettext (C:\Python26\lib\gettext.pyc)
-W: delayed  eval hack detected at line 0 - sqlalchemy.util (C:\Python26\lib\site-packages\sqlalchemy-0.5.8-py2.6.egg\sqlalchemy\util.pyc)
-W: delayed  exec statement detected at line 0 - sqlalchemy.util (C:\Python26\lib\site-packages\sqlalchemy-0.5.8-py2.6.egg\sqlalchemy\util.pyc)

scripts/windows-builder.py

@@ -115,17 +115,30 @@ build_path = os.path.join(branch_path, u'build', u'pyi.win32', u'OpenLP')
 dist_path = os.path.join(branch_path, u'dist', u'OpenLP')
 enchant_path = os.path.join(site_packages, u'enchant')
 
+def update_code():
+    print u'Updating the code...'
+    os.chdir(branch_path)
+    bzr = Popen((u'bzr', u'update'), stdout=PIPE)
+    output, error = bzr.communicate()
+    code = bzr.wait()
+    if code != 0:
+       print output
+       raise Exception(u'Error updating the code')
+
 def clean_build_directories():
-    #if not os.path.exists(build_path)
+    dist_dir = os.path.join(build_path, u'dist')
-    for root, dirs, files in os.walk(build_path, topdown=False):
+    build_dir = os.path.join(build_path, u'build')
-        print root
+    if os.path.exists(dist_dir):
-        for file in files:
+        for root, dirs, files in os.walk(dist_dir, topdown=False):
-            os.remove(os.path.join(root, file))
+            print root
-    #os.removedirs(build_path)
+            for file in files:
-    for root, dirs, files in os.walk(dist_path, topdown=False):
+                os.remove(os.path.join(root, file))
-        for file in files:
+        os.removedirs(dist_dir)
-            os.remove(os.path.join(root, file))
+    if os.path.exists(build_dir):
-    #os.removedirs(dist_path)
+        for root, dirs, files in os.walk(build_dir, topdown=False):
+            for file in files:
+                os.remove(os.path.join(root, file))
+        os.removedirs(build_dir)
 
 def run_pyinstaller():
     print u'Running PyInstaller...'
@@ -239,6 +252,7 @@ def main():
        print "PyInstaller:", pyi_build
        print "Inno Setup path:", innosetup_path
        print "Windows resources:", winres_path
+    update_code()
     #clean_build_directories()
     run_pyinstaller()
     write_version_file()