diff --git a/openlp/core/__init__.py b/openlp/core/__init__.py index 33eb916be..f6ce8bb06 100644 --- a/openlp/core/__init__.py +++ b/openlp/core/__init__.py @@ -242,7 +242,7 @@ def set_up_logging(log_path): logfile.setFormatter(logging.Formatter(u'%(asctime)s %(name)-55s %(levelname)-8s %(message)s')) log.addHandler(logfile) if log.isEnabledFor(logging.DEBUG): - print 'Logging to:', filename + print('Logging to: %s' % filename) def main(args=None): diff --git a/openlp/core/lib/db.py b/openlp/core/lib/db.py index 5601fa530..398e8c29c 100644 --- a/openlp/core/lib/db.py +++ b/openlp/core/lib/db.py @@ -61,8 +61,7 @@ def init_db(url, auto_flush=True, auto_commit=False): """ engine = create_engine(url, poolclass=NullPool) metadata = MetaData(bind=engine) - session = scoped_session(sessionmaker(autoflush=auto_flush, - autocommit=auto_commit, bind=engine)) + session = scoped_session(sessionmaker(autoflush=auto_flush, autocommit=auto_commit, bind=engine)) return session, metadata diff --git a/openlp/core/lib/dockwidget.py b/openlp/core/lib/dockwidget.py index 743607dd6..c7fa0e6eb 100644 --- a/openlp/core/lib/dockwidget.py +++ b/openlp/core/lib/dockwidget.py @@ -35,7 +35,7 @@ import logging from PyQt4 import QtGui -from openlp.core.lib import build_icon, ScreenList +from openlp.core.lib import ScreenList, build_icon log = logging.getLogger(__name__) diff --git a/openlp/core/lib/formattingtags.py b/openlp/core/lib/formattingtags.py index abbc18f16..b7bbd7322 100644 --- a/openlp/core/lib/formattingtags.py +++ b/openlp/core/lib/formattingtags.py @@ -31,7 +31,7 @@ Provide HTML Tag management and Formatting Tag access class """ import cPickle -from openlp.core.lib import translate, Settings +from openlp.core.lib import Settings, translate class FormattingTags(object): diff --git a/openlp/core/lib/imagemanager.py b/openlp/core/lib/imagemanager.py index 9726079f7..7d738a664 100644 --- a/openlp/core/lib/imagemanager.py +++ b/openlp/core/lib/imagemanager.py @@ -39,7 +39,7 @@ import Queue from PyQt4 import QtCore -from openlp.core.lib import resize_image, image_to_byte, Receiver, Registry, ScreenList +from openlp.core.lib import Receiver, Registry, ScreenList, resize_image, image_to_byte log = logging.getLogger(__name__) diff --git a/openlp/core/lib/renderer.py b/openlp/core/lib/renderer.py index 7b7027efd..ca2a3b073 100644 --- a/openlp/core/lib/renderer.py +++ b/openlp/core/lib/renderer.py @@ -31,8 +31,8 @@ import logging from PyQt4 import QtGui, QtCore, QtWebKit -from openlp.core.lib import ServiceItem, expand_tags, build_lyrics_format_css, build_lyrics_outline_css, Receiver, \ - ItemCapabilities, FormattingTags, ImageSource, Registry, ScreenList +from openlp.core.lib import FormattingTags, ImageSource, ItemCapabilities, Receiver, Registry, ScreenList, \ + ServiceItem, expand_tags, build_lyrics_format_css, build_lyrics_outline_css from openlp.core.lib.theme import ThemeLevel from openlp.core.ui import MainDisplay diff --git a/openlp/core/lib/screen.py b/openlp/core/lib/screen.py index 9c118de99..c0272ff81 100644 --- a/openlp/core/lib/screen.py +++ b/openlp/core/lib/screen.py @@ -139,8 +139,7 @@ class ScreenList(object): """ screen_list = [] for screen in self.screen_list: - screen_name = u'%s %d' % (translate('OpenLP.ScreenList', 'Screen'), - screen[u'number'] + 1) + screen_name = u'%s %d' % (translate('OpenLP.ScreenList', 'Screen'), screen[u'number'] + 1) if screen[u'primary']: screen_name = u'%s (%s)' % (screen_name, translate('OpenLP.ScreenList', 'primary')) screen_list.append(screen_name) @@ -237,8 +236,7 @@ class ScreenList(object): y = window.y() + (window.height() / 2) for screen in self.screen_list: size = screen[u'size'] - if x >= size.x() and x <= (size.x() + size.width()) and \ - y >= size.y() and y <= (size.y() + size.height()): + if x >= size.x() and x <= (size.x() + size.width()) and y >= size.y() and y <= (size.y() + size.height()): return screen[u'number'] def load_screen_settings(self): diff --git a/openlp/core/lib/serviceitem.py b/openlp/core/lib/serviceitem.py index 743f6b00a..47c9852a8 100644 --- a/openlp/core/lib/serviceitem.py +++ b/openlp/core/lib/serviceitem.py @@ -39,7 +39,7 @@ import uuid from PyQt4 import QtGui -from openlp.core.lib import build_icon, clean_tags, expand_tags, translate, ImageSource, Settings, Registry +from openlp.core.lib import ImageSource, Settings, Registry, build_icon, clean_tags, expand_tags, translate log = logging.getLogger(__name__) diff --git a/openlp/core/lib/settings.py b/openlp/core/lib/settings.py index 78e8004c4..7e72c6d4c 100644 --- a/openlp/core/lib/settings.py +++ b/openlp/core/lib/settings.py @@ -143,6 +143,7 @@ class Settings(QtCore.QSettings): u'media/players': u'webkit', u'media/override player': QtCore.Qt.Unchecked, u'players/background color': u'#000000', + u'servicemanager/last directory': u'', u'servicemanager/last file': u'', u'servicemanager/service theme': u'', u'SettingsImport/file_date_created': datetime.datetime.now().strftime("%Y-%m-%d %H:%M"), @@ -242,7 +243,6 @@ class Settings(QtCore.QSettings): (u'media/background color', u'players/background color', []), (u'themes/last directory', u'themes/last directory import', []), (u'themes/last directory 1', u'themes/last directory export', []), - (u'servicemanager/last directory', u'', []), (u'songs/last directory 1', u'songs/last directory import', []), (u'songusage/last directory 1', u'songusage/last directory export', []), (u'user interface/mainwindow splitter geometry', u'user interface/main window splitter geometry', []), diff --git a/openlp/core/lib/ui.py b/openlp/core/lib/ui.py index 0d869d724..4f4aa0596 100644 --- a/openlp/core/lib/ui.py +++ b/openlp/core/lib/ui.py @@ -33,7 +33,7 @@ import logging from PyQt4 import QtCore, QtGui -from openlp.core.lib import build_icon, translate, Receiver, UiStrings +from openlp.core.lib import Receiver, UiStrings, build_icon, translate from openlp.core.utils.actions import ActionList @@ -67,7 +67,7 @@ def add_welcome_page(parent, image): parent.addPage(parent.welcomePage) -def create_button_box(dialog, name, standard_buttons, custom_buttons=[]): +def create_button_box(dialog, name, standard_buttons, custom_buttons=None): """ Creates a QDialogButtonBox with the given buttons. The ``accepted()`` and ``rejected()`` signals of the button box are connected with the dialogs @@ -88,6 +88,8 @@ def create_button_box(dialog, name, standard_buttons, custom_buttons=[]): QtGui.QAbstractButton it is added with QDialogButtonBox.ActionRole. Otherwhise the item has to be a tuple of a button and a ButtonRole. """ + if custom_buttons is None: + custom_buttons = [] buttons = QtGui.QDialogButtonBox.NoButton if u'ok' in standard_buttons: buttons |= QtGui.QDialogButtonBox.Ok diff --git a/openlp/core/ui/aboutdialog.py b/openlp/core/ui/aboutdialog.py index cf04f4927..0115d8af2 100644 --- a/openlp/core/ui/aboutdialog.py +++ b/openlp/core/ui/aboutdialog.py @@ -29,7 +29,7 @@ from PyQt4 import QtGui -from openlp.core.lib import build_icon, translate, UiStrings +from openlp.core.lib import UiStrings, build_icon, translate from openlp.core.lib.ui import create_button, create_button_box diff --git a/openlp/core/ui/advancedtab.py b/openlp/core/ui/advancedtab.py index 08a98d918..7cd89c252 100644 --- a/openlp/core/ui/advancedtab.py +++ b/openlp/core/ui/advancedtab.py @@ -37,7 +37,7 @@ import sys from PyQt4 import QtCore, QtGui from openlp.core.lib import SettingsTab, Receiver, Settings, UiStrings, translate, build_icon -from openlp.core.utils import get_images_filter, AppLocation, format_time +from openlp.core.utils import AppLocation, format_time, get_images_filter from openlp.core.lib import SlideLimits log = logging.getLogger(__name__) @@ -449,7 +449,7 @@ class AdvancedTab(SettingsTab): settings.setValue(u'enable exit confirmation', self.enable_auto_close_check_box.isChecked()) settings.setValue(u'hide mouse', self.hide_mouse_check_box.isChecked()) settings.setValue(u'x11 bypass wm', self.x11_bypass_check_box.isChecked()) - settings.setValue(u'alternate rows', self.alternate_rows_check_box.isChecked()) + settings.setValue(u'alternate rows', self.alternate_rows_check_box.isChecked()) settings.setValue(u'default color', self.default_color) settings.setValue(u'default image', self.default_file_edit.text()) settings.setValue(u'slide limits', self.slide_limits) @@ -666,7 +666,7 @@ class AdvancedTab(SettingsTab): The state of the check box (boolean). """ self.display_changed = True - + def on_alternate_rows_check_box_toggled(self, checked): """ Notify user about required restart. @@ -681,17 +681,17 @@ class AdvancedTab(SettingsTab): def on_end_slide_button_clicked(self): """ Stop at the end either top ot bottom - """ + """ self.slide_limits = SlideLimits.End def on_wrap_slide_button_clicked(self): """ - Wrap round the service item - """ + Wrap round the service item + """ self.slide_limits = SlideLimits.Wrap def on_next_item_button_clicked(self): """ Advance to the next service item - """ + """ self.slide_limits = SlideLimits.Next diff --git a/openlp/core/ui/exceptionform.py b/openlp/core/ui/exceptionform.py index 580e5ae71..0d8a7c74f 100644 --- a/openlp/core/ui/exceptionform.py +++ b/openlp/core/ui/exceptionform.py @@ -88,7 +88,7 @@ except AttributeError: WEBKIT_VERSION = u'-' -from openlp.core.lib import translate, UiStrings, Settings +from openlp.core.lib import UiStrings, Settings, translate from openlp.core.utils import get_application_version from exceptiondialog import Ui_ExceptionDialog @@ -141,9 +141,9 @@ class ExceptionForm(QtGui.QDialog, Ui_ExceptionDialog): u'pyUNO bridge: %s\n' % UNO_VERSION if platform.system() == u'Linux': if os.environ.get(u'KDE_FULL_SESSION') == u'true': - system = system + u'Desktop: KDE SC\n' + system += u'Desktop: KDE SC\n' elif os.environ.get(u'GNOME_DESKTOP_SESSION_ID'): - system = system + u'Desktop: GNOME\n' + system += u'Desktop: GNOME\n' return (openlp_version, description, traceback, system, libraries) def onSaveReportButtonClicked(self): diff --git a/openlp/core/ui/firsttimeform.py b/openlp/core/ui/firsttimeform.py index 29e2cd97a..daedbb94e 100644 --- a/openlp/core/ui/firsttimeform.py +++ b/openlp/core/ui/firsttimeform.py @@ -41,8 +41,8 @@ from ConfigParser import SafeConfigParser from PyQt4 import QtCore, QtGui -from openlp.core.lib import translate, PluginStatus, Receiver, build_icon, check_directory_exists, Settings, Registry -from openlp.core.utils import get_web_page, AppLocation, get_filesystem_encoding +from openlp.core.lib import PluginStatus, Receiver, Settings, Registry, build_icon, check_directory_exists, translate +from openlp.core.utils import AppLocation, get_web_page, get_filesystem_encoding from firsttimewizard import Ui_FirstTimeWizard, FirstTimePage log = logging.getLogger(__name__) @@ -369,7 +369,7 @@ class FirstTimeForm(QtGui.QWizard, Ui_FirstTimeWizard): self.max_progress += size if self.max_progress: # Add on 2 for plugins status setting plus a "finished" point. - self.max_progress = self.max_progress + 2 + self.max_progress += 2 self.progressBar.setValue(0) self.progressBar.setMinimum(0) self.progressBar.setMaximum(self.max_progress) diff --git a/openlp/core/ui/formattingtagdialog.py b/openlp/core/ui/formattingtagdialog.py index fbf5707ed..8c72a9120 100644 --- a/openlp/core/ui/formattingtagdialog.py +++ b/openlp/core/ui/formattingtagdialog.py @@ -31,7 +31,7 @@ The UI widgets for the formatting tags window. """ from PyQt4 import QtCore, QtGui -from openlp.core.lib import translate, UiStrings +from openlp.core.lib import UiStrings, translate from openlp.core.lib.ui import create_button_box diff --git a/openlp/core/ui/formattingtagform.py b/openlp/core/ui/formattingtagform.py index 1085afbcd..b3611b1d7 100644 --- a/openlp/core/ui/formattingtagform.py +++ b/openlp/core/ui/formattingtagform.py @@ -33,7 +33,7 @@ cannot be changed. """ from PyQt4 import QtCore, QtGui -from openlp.core.lib import translate, FormattingTags +from openlp.core.lib import FormattingTags, translate from openlp.core.lib.ui import critical_error_message_box from openlp.core.ui.formattingtagdialog import Ui_FormattingTagDialog diff --git a/openlp/core/ui/generaltab.py b/openlp/core/ui/generaltab.py index 4626d36d2..e88ae2b15 100644 --- a/openlp/core/ui/generaltab.py +++ b/openlp/core/ui/generaltab.py @@ -33,7 +33,7 @@ import logging from PyQt4 import QtCore, QtGui -from openlp.core.lib import Receiver, Settings, SettingsTab, translate, ScreenList, UiStrings +from openlp.core.lib import Receiver, Settings, SettingsTab, ScreenList, UiStrings, translate log = logging.getLogger(__name__) diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py index 9cae5dfac..badf55548 100644 --- a/openlp/core/ui/maindisplay.py +++ b/openlp/core/ui/maindisplay.py @@ -42,8 +42,8 @@ import sys from PyQt4 import QtCore, QtGui, QtWebKit, QtOpenGL from PyQt4.phonon import Phonon -from openlp.core.lib import Receiver, build_html, ServiceItem, image_to_byte, translate, expand_tags,\ - Settings, ImageSource, Registry +from openlp.core.lib import Receiver, ServiceItem, Settings, ImageSource, Registry, build_html, expand_tags, \ + image_to_byte, translate from openlp.core.lib.theme import BackgroundType from openlp.core.lib import ScreenList diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py index 044dc14ce..5e21a6c28 100644 --- a/openlp/core/ui/mainwindow.py +++ b/openlp/core/ui/mainwindow.py @@ -41,13 +41,13 @@ from datetime import datetime from PyQt4 import QtCore, QtGui -from openlp.core.lib import Renderer, build_icon, OpenLPDockWidget, PluginManager, Receiver, translate, ImageManager, \ - PluginStatus, Registry, Settings, ScreenList, check_directory_exists +from openlp.core.lib import Renderer, OpenLPDockWidget, PluginManager, Receiver, ImageManager, PluginStatus, Registry, \ + Settings, ScreenList, build_icon, check_directory_exists, translate from openlp.core.lib.ui import UiStrings, create_action from openlp.core.ui import AboutForm, SettingsForm, ServiceManager, ThemeManager, SlideController, PluginForm, \ MediaDockManager, ShortcutListForm, FormattingTagForm from openlp.core.ui.media import MediaController -from openlp.core.utils import AppLocation, add_actions, LanguageManager, get_application_version, \ +from openlp.core.utils import AppLocation, LanguageManager, add_actions, get_application_version, \ get_filesystem_encoding from openlp.core.utils.actions import ActionList, CategoryOrder from openlp.core.ui.firsttimeform import FirstTimeForm @@ -910,7 +910,7 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow): return # Make sure it's a .conf file. if not export_file_name.endswith(u'conf'): - export_file_name = export_file_name + u'.conf' + export_file_name += u'.conf' temp_file = os.path.join(unicode(gettempdir(), get_filesystem_encoding()), u'openlp', u'exportConf.tmp') self.saveSettings() diff --git a/openlp/core/ui/media/mediacontroller.py b/openlp/core/ui/media/mediacontroller.py index 6d0c002de..73cd5b263 100644 --- a/openlp/core/ui/media/mediacontroller.py +++ b/openlp/core/ui/media/mediacontroller.py @@ -35,7 +35,7 @@ import os import datetime from PyQt4 import QtCore, QtGui -from openlp.core.lib import OpenLPToolbar, Receiver, translate, Settings, Registry, UiStrings +from openlp.core.lib import OpenLPToolbar, Receiver, Settings, Registry, UiStrings, translate from openlp.core.lib.ui import critical_error_message_box from openlp.core.ui.media import MediaState, MediaInfo, MediaType, get_media_players, set_media_players from openlp.core.ui.media.mediaplayer import MediaPlayer @@ -750,4 +750,4 @@ class MediaController(object): self._service_manager = Registry().get(u'service_manager') return self._service_manager - service_manager = property(_get_service_manager) \ No newline at end of file + service_manager = property(_get_service_manager) diff --git a/openlp/core/ui/media/phononplayer.py b/openlp/core/ui/media/phononplayer.py index ede7b2169..267466a98 100644 --- a/openlp/core/ui/media/phononplayer.py +++ b/openlp/core/ui/media/phononplayer.py @@ -36,7 +36,7 @@ from datetime import datetime from PyQt4 import QtGui from PyQt4.phonon import Phonon -from openlp.core.lib import translate, Settings +from openlp.core.lib import Settings, translate from openlp.core.ui.media import MediaState from openlp.core.ui.media.mediaplayer import MediaPlayer diff --git a/openlp/core/ui/media/playertab.py b/openlp/core/ui/media/playertab.py index cfa274d0c..c2224369a 100644 --- a/openlp/core/ui/media/playertab.py +++ b/openlp/core/ui/media/playertab.py @@ -31,7 +31,7 @@ The :mod:`~openlp.core.ui.media.playertab` module holds the configuration tab fo """ from PyQt4 import QtCore, QtGui -from openlp.core.lib import SettingsTab, translate, Receiver, Settings, UiStrings +from openlp.core.lib import SettingsTab, Receiver, Settings, UiStrings, translate from openlp.core.lib.ui import create_button from openlp.core.ui.media import get_media_players, set_media_players diff --git a/openlp/core/ui/media/vlcplayer.py b/openlp/core/ui/media/vlcplayer.py index 948577aac..6d5a45549 100644 --- a/openlp/core/ui/media/vlcplayer.py +++ b/openlp/core/ui/media/vlcplayer.py @@ -37,7 +37,7 @@ import sys from PyQt4 import QtGui -from openlp.core.lib import translate, Settings +from openlp.core.lib import Settings, translate from openlp.core.ui.media import MediaState from openlp.core.ui.media.mediaplayer import MediaPlayer diff --git a/openlp/core/ui/media/webkitplayer.py b/openlp/core/ui/media/webkitplayer.py index 0a768fe37..963e4e6f7 100644 --- a/openlp/core/ui/media/webkitplayer.py +++ b/openlp/core/ui/media/webkitplayer.py @@ -33,7 +33,7 @@ from PyQt4 import QtGui import logging -from openlp.core.lib import translate, Settings +from openlp.core.lib import Settings, translate from openlp.core.ui.media import MediaState from openlp.core.ui.media.mediaplayer import MediaPlayer diff --git a/openlp/core/ui/plugindialog.py b/openlp/core/ui/plugindialog.py index 83f8b21a7..77fcf66c7 100644 --- a/openlp/core/ui/plugindialog.py +++ b/openlp/core/ui/plugindialog.py @@ -31,7 +31,7 @@ The UI widgets of the plugin view dialog #""" from PyQt4 import QtCore, QtGui -from openlp.core.lib import translate, UiStrings +from openlp.core.lib import UiStrings, translate from openlp.core.lib.ui import create_button_box diff --git a/openlp/core/ui/printservicedialog.py b/openlp/core/ui/printservicedialog.py index 7f7abcf27..03ad043d2 100644 --- a/openlp/core/ui/printservicedialog.py +++ b/openlp/core/ui/printservicedialog.py @@ -31,7 +31,7 @@ The UI widgets of the print service dialog. """ from PyQt4 import QtCore, QtGui -from openlp.core.lib import build_icon, translate, SpellTextEdit, UiStrings +from openlp.core.lib import SpellTextEdit, UiStrings, build_icon, translate class ZoomSize(object): diff --git a/openlp/core/ui/printserviceform.py b/openlp/core/ui/printserviceform.py index 689323cd5..d9fa54f36 100644 --- a/openlp/core/ui/printserviceform.py +++ b/openlp/core/ui/printserviceform.py @@ -36,7 +36,7 @@ import os from PyQt4 import QtCore, QtGui from lxml import html -from openlp.core.lib import translate, get_text_file_string, Receiver, Settings, UiStrings, Registry +from openlp.core.lib import Receiver, Settings, UiStrings, Registry, translate, get_text_file_string from openlp.core.ui.printservicedialog import Ui_PrintServiceDialog, ZoomSize from openlp.core.utils import AppLocation @@ -428,4 +428,4 @@ class PrintServiceForm(QtGui.QDialog, Ui_PrintServiceDialog): self._main_window = Registry().get(u'main_window') return self._main_window - main_window = property(_get_main_window) \ No newline at end of file + main_window = property(_get_main_window) diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py index b45794556..cfa0d4707 100644 --- a/openlp/core/ui/servicemanager.py +++ b/openlp/core/ui/servicemanager.py @@ -42,8 +42,8 @@ log = logging.getLogger(__name__) from PyQt4 import QtCore, QtGui -from openlp.core.lib import OpenLPToolbar, ServiceItem, Receiver, build_icon, ItemCapabilities, \ - translate, str_to_bool, check_directory_exists, Settings, PluginStatus, Registry, UiStrings +from openlp.core.lib import OpenLPToolbar, ServiceItem, Receiver, ItemCapabilities, Settings, PluginStatus, Registry, \ + UiStrings, build_icon, translate, str_to_bool, check_directory_exists from openlp.core.lib.theme import ThemeLevel from openlp.core.lib.ui import critical_error_message_box, create_widget_action, find_and_set_in_combo_box from openlp.core.ui import ServiceNoteForm, ServiceItemEditForm, StartTimeForm @@ -661,11 +661,11 @@ class ServiceManager(QtGui.QWidget, ServiceManagerDialog): # SaveAs from osz to oszl is not valid as the files will be deleted # on exit which is not sensible or usable in the long term. if self._file_name.endswith(u'oszl') or self.service_has_all_original_files: - file_name = QtGui.QFileDialog.getSavefile_name(self.main_window, UiStrings().SaveService, path, + file_name = QtGui.QFileDialog.getSaveFileName(self.main_window, UiStrings().SaveService, path, translate('OpenLP.ServiceManager', 'OpenLP Service Files (*.osz);; OpenLP Service Files - lite (*.oszl)')) else: - file_name = QtGui.QFileDialog.getSavefile_name(self.main_window, UiStrings().SaveService, path, + file_name = QtGui.QFileDialog.getSaveFileName(self.main_window, UiStrings().SaveService, path, translate('OpenLP.ServiceManager', 'OpenLP Service Files (*.osz);;')) if not file_name: return False diff --git a/openlp/core/ui/servicenoteform.py b/openlp/core/ui/servicenoteform.py index 7d624ab8c..c62349104 100644 --- a/openlp/core/ui/servicenoteform.py +++ b/openlp/core/ui/servicenoteform.py @@ -31,7 +31,7 @@ The :mod:`~openlp.core.ui.servicenoteform` module contains the `ServiceNoteForm` """ from PyQt4 import QtGui -from openlp.core.lib import translate, SpellTextEdit, Registry +from openlp.core.lib import SpellTextEdit, Registry, translate from openlp.core.lib.ui import create_button_box @@ -83,4 +83,4 @@ class ServiceNoteForm(QtGui.QDialog): self._main_window = Registry().get(u'main_window') return self._main_window - main_window = property(_get_main_window) \ No newline at end of file + main_window = property(_get_main_window) diff --git a/openlp/core/ui/settingsform.py b/openlp/core/ui/settingsform.py index 0543f1087..438898048 100644 --- a/openlp/core/ui/settingsform.py +++ b/openlp/core/ui/settingsform.py @@ -33,7 +33,7 @@ import logging from PyQt4 import QtGui -from openlp.core.lib import Receiver, build_icon, PluginStatus, Registry +from openlp.core.lib import Receiver, PluginStatus, Registry, build_icon from openlp.core.ui import AdvancedTab, GeneralTab, ThemesTab from openlp.core.ui.media import PlayerTab from settingsdialog import Ui_SettingsDialog @@ -165,4 +165,4 @@ class SettingsForm(QtGui.QDialog, Ui_SettingsDialog): self._service_manager = Registry().get(u'service_manager') return self._service_manager - service_manager = property(_get_service_manager) \ No newline at end of file + service_manager = property(_get_service_manager) diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py index ef5ba7ba1..607ae1dd5 100644 --- a/openlp/core/ui/slidecontroller.py +++ b/openlp/core/ui/slidecontroller.py @@ -36,8 +36,8 @@ from collections import deque from PyQt4 import QtCore, QtGui -from openlp.core.lib import OpenLPToolbar, Receiver, ItemCapabilities, translate, build_icon, build_html, \ - ServiceItem, ImageSource, SlideLimits, ServiceItemAction, Settings, Registry, UiStrings, ScreenList +from openlp.core.lib import OpenLPToolbar, Receiver, ItemCapabilities, ServiceItem, ImageSource, SlideLimits, \ + ServiceItemAction, Settings, Registry, UiStrings, ScreenList, build_icon, build_html, translate from openlp.core.ui import HideMode, MainDisplay, Display, DisplayControllerType from openlp.core.lib.ui import create_action from openlp.core.utils.actions import ActionList, CategoryOrder @@ -608,7 +608,7 @@ class SlideController(DisplayController): elif width < 300 and not self.hideMenu.isVisible(): self.toolbar.setWidgetVisible(self.wideMenu, False) self.toolbar.setWidgetVisible(self.hideMenuList) - + def onSongBarHandler(self): """ Some song handler diff --git a/openlp/core/ui/splashscreen.py b/openlp/core/ui/splashscreen.py index d2b41d067..c6f259499 100644 --- a/openlp/core/ui/splashscreen.py +++ b/openlp/core/ui/splashscreen.py @@ -29,7 +29,6 @@ """ The splash screen """ -from openlp.core.lib import Receiver from PyQt4 import QtCore, QtGui diff --git a/openlp/core/ui/starttimedialog.py b/openlp/core/ui/starttimedialog.py index e13c86430..7e370abbc 100644 --- a/openlp/core/ui/starttimedialog.py +++ b/openlp/core/ui/starttimedialog.py @@ -31,7 +31,7 @@ The UI widgets for the time dialog """ from PyQt4 import QtCore, QtGui -from openlp.core.lib import translate, UiStrings +from openlp.core.lib import UiStrings, translate from openlp.core.lib.ui import create_button_box diff --git a/openlp/core/ui/starttimeform.py b/openlp/core/ui/starttimeform.py index 7c9e694f0..2ab918b6f 100644 --- a/openlp/core/ui/starttimeform.py +++ b/openlp/core/ui/starttimeform.py @@ -33,7 +33,7 @@ from PyQt4 import QtGui from starttimedialog import Ui_StartTimeDialog -from openlp.core.lib import translate, UiStrings, Registry +from openlp.core.lib import UiStrings, Registry, translate from openlp.core.lib.ui import critical_error_message_box @@ -105,4 +105,4 @@ class StartTimeForm(QtGui.QDialog, Ui_StartTimeDialog): self._main_window = Registry().get(u'main_window') return self._main_window - main_window = property(_get_main_window) \ No newline at end of file + main_window = property(_get_main_window) diff --git a/openlp/core/ui/themeform.py b/openlp/core/ui/themeform.py index f1a7a3010..a23e08207 100644 --- a/openlp/core/ui/themeform.py +++ b/openlp/core/ui/themeform.py @@ -34,7 +34,7 @@ import os from PyQt4 import QtCore, QtGui -from openlp.core.lib import Receiver, translate, UiStrings, Registry +from openlp.core.lib import Receiver, UiStrings, Registry, translate from openlp.core.lib.theme import BackgroundType, BackgroundGradientType from openlp.core.lib.ui import critical_error_message_box from openlp.core.ui import ThemeLayoutForm diff --git a/openlp/core/ui/thememanager.py b/openlp/core/ui/thememanager.py index a482a3c44..08746b884 100644 --- a/openlp/core/ui/thememanager.py +++ b/openlp/core/ui/thememanager.py @@ -38,9 +38,9 @@ import re from xml.etree.ElementTree import ElementTree, XML from PyQt4 import QtCore, QtGui -from openlp.core.lib import OpenLPToolbar, get_text_file_string, build_icon, Receiver, SettingsManager, translate, \ - check_item_selected, check_directory_exists, create_thumb, validate_thumb, ImageSource, Settings, Registry, \ - UiStrings +from openlp.core.lib import ImageSource, OpenLPToolbar, Receiver, Registry, SettingsManager, Settings, UiStrings, \ + get_text_file_string, build_icon, translate, check_item_selected, check_directory_exists, create_thumb, \ + validate_thumb from openlp.core.lib.theme import ThemeXML, BackgroundType, VerticalType, BackgroundGradientType from openlp.core.lib.ui import critical_error_message_box, create_widget_action from openlp.core.theme import Theme @@ -859,4 +859,4 @@ class ThemeManager(QtGui.QWidget): self._application = Registry().get(u'application') return self._application - application = property(_get_application) \ No newline at end of file + application = property(_get_application) diff --git a/openlp/core/ui/themestab.py b/openlp/core/ui/themestab.py index b502d11e0..0cf491e72 100644 --- a/openlp/core/ui/themestab.py +++ b/openlp/core/ui/themestab.py @@ -31,7 +31,7 @@ The Themes configuration tab """ from PyQt4 import QtCore, QtGui -from openlp.core.lib import Receiver, Settings, SettingsTab, translate, UiStrings +from openlp.core.lib import Receiver, Settings, SettingsTab, UiStrings, translate from openlp.core.lib.theme import ThemeLevel from openlp.core.lib.ui import find_and_set_in_combo_box diff --git a/openlp/core/ui/themewizard.py b/openlp/core/ui/themewizard.py index 7a434e998..fb23a2ac6 100644 --- a/openlp/core/ui/themewizard.py +++ b/openlp/core/ui/themewizard.py @@ -31,7 +31,7 @@ The Create/Edit theme wizard """ from PyQt4 import QtCore, QtGui -from openlp.core.lib import translate, build_icon, UiStrings +from openlp.core.lib import UiStrings, build_icon, translate from openlp.core.lib.theme import HorizontalType, BackgroundType, BackgroundGradientType from openlp.core.lib.ui import add_welcome_page, create_valign_selection_widgets diff --git a/openlp/core/ui/wizard.py b/openlp/core/ui/wizard.py index 46ef55fd1..744dd8087 100644 --- a/openlp/core/ui/wizard.py +++ b/openlp/core/ui/wizard.py @@ -34,7 +34,7 @@ import os from PyQt4 import QtCore, QtGui -from openlp.core.lib import build_icon, Receiver, Registry, Settings, translate, UiStrings +from openlp.core.lib import Receiver, Registry, Settings, UiStrings, build_icon, translate from openlp.core.lib.ui import add_welcome_page log = logging.getLogger(__name__) @@ -295,4 +295,4 @@ class OpenLPWizard(QtGui.QWizard): self._application = Registry().get(u'application') return self._application - application = property(_get_application) \ No newline at end of file + application = property(_get_application) diff --git a/openlp/core/utils/languagemanager.py b/openlp/core/utils/languagemanager.py index f69bb40c6..00a0d0079 100644 --- a/openlp/core/utils/languagemanager.py +++ b/openlp/core/utils/languagemanager.py @@ -36,7 +36,7 @@ import sys from PyQt4 import QtCore, QtGui from openlp.core.utils import AppLocation -from openlp.core.lib import translate, Settings +from openlp.core.lib import Settings, translate log = logging.getLogger(__name__) diff --git a/openlp/plugins/alerts/alertsplugin.py b/openlp/plugins/alerts/alertsplugin.py index 29727b79d..de2c92f7e 100644 --- a/openlp/plugins/alerts/alertsplugin.py +++ b/openlp/plugins/alerts/alertsplugin.py @@ -29,9 +29,9 @@ import logging -from PyQt4 import QtCore, QtGui +from PyQt4 import QtGui -from openlp.core.lib import Plugin, StringContent, build_icon, translate, Settings +from openlp.core.lib import Plugin, Settings, StringContent, build_icon, translate from openlp.core.lib.db import Manager from openlp.core.lib.ui import create_action, UiStrings from openlp.core.lib.theme import VerticalType diff --git a/openlp/plugins/alerts/lib/alertstab.py b/openlp/plugins/alerts/lib/alertstab.py index 60451f20c..05aff7fd6 100644 --- a/openlp/plugins/alerts/lib/alertstab.py +++ b/openlp/plugins/alerts/lib/alertstab.py @@ -29,8 +29,7 @@ from PyQt4 import QtCore, QtGui -from openlp.core.lib import SettingsTab, translate, Receiver, Settings, UiStrings -from openlp.core.ui import AlertLocation +from openlp.core.lib import SettingsTab, Receiver, Settings, UiStrings, translate from openlp.core.lib.ui import create_valign_selection_widgets class AlertsTab(SettingsTab): diff --git a/openlp/plugins/bibles/bibleplugin.py b/openlp/plugins/bibles/bibleplugin.py index 9a584dc63..8fcbaebc1 100644 --- a/openlp/plugins/bibles/bibleplugin.py +++ b/openlp/plugins/bibles/bibleplugin.py @@ -31,8 +31,8 @@ import logging from PyQt4 import QtGui -from openlp.core.lib import Plugin, StringContent, build_icon, translate, Settings -from openlp.core.lib.ui import create_action, UiStrings +from openlp.core.lib import Plugin, StringContent, build_icon, translate +from openlp.core.lib.ui import UiStrings, create_action from openlp.core.utils.actions import ActionList from openlp.plugins.bibles.lib import BibleManager, BiblesTab, BibleMediaItem, LayoutStyle, DisplayStyle, \ LanguageSelection diff --git a/openlp/plugins/bibles/forms/bibleimportform.py b/openlp/plugins/bibles/forms/bibleimportform.py index 10d50a9af..3b1455f68 100644 --- a/openlp/plugins/bibles/forms/bibleimportform.py +++ b/openlp/plugins/bibles/forms/bibleimportform.py @@ -34,7 +34,7 @@ import os from PyQt4 import QtCore, QtGui -from openlp.core.lib import translate, Settings, UiStrings +from openlp.core.lib import Settings, UiStrings, translate from openlp.core.lib.db import delete_database from openlp.core.lib.ui import critical_error_message_box from openlp.core.ui.wizard import OpenLPWizard, WizardStrings diff --git a/openlp/plugins/bibles/forms/bibleupgradeform.py b/openlp/plugins/bibles/forms/bibleupgradeform.py index 10589cbee..f7f16aace 100644 --- a/openlp/plugins/bibles/forms/bibleupgradeform.py +++ b/openlp/plugins/bibles/forms/bibleupgradeform.py @@ -36,7 +36,7 @@ from tempfile import gettempdir from PyQt4 import QtCore, QtGui -from openlp.core.lib import Receiver, translate, check_directory_exists, Settings, UiStrings +from openlp.core.lib import Receiver, Settings, UiStrings, translate, check_directory_exists from openlp.core.lib.ui import critical_error_message_box from openlp.core.ui.wizard import OpenLPWizard, WizardStrings from openlp.core.utils import AppLocation, delete_file, get_filesystem_encoding diff --git a/openlp/plugins/bibles/forms/editbibleform.py b/openlp/plugins/bibles/forms/editbibleform.py index a6e9e6d6b..939cd8383 100644 --- a/openlp/plugins/bibles/forms/editbibleform.py +++ b/openlp/plugins/bibles/forms/editbibleform.py @@ -32,7 +32,7 @@ import re from PyQt4 import QtGui -from openlp.core.lib import Registry, translate, UiStrings +from openlp.core.lib import Registry, UiStrings, translate from openlp.core.lib.ui import critical_error_message_box from editbibledialog import Ui_EditBibleDialog from openlp.plugins.bibles.lib import BibleStrings diff --git a/openlp/plugins/bibles/lib/__init__.py b/openlp/plugins/bibles/lib/__init__.py index 2ba2ff590..219b91f90 100644 --- a/openlp/plugins/bibles/lib/__init__.py +++ b/openlp/plugins/bibles/lib/__init__.py @@ -33,7 +33,7 @@ plugin. import logging import re -from openlp.core.lib import translate, Settings +from openlp.core.lib import Settings, translate log = logging.getLogger(__name__) diff --git a/openlp/plugins/bibles/lib/biblestab.py b/openlp/plugins/bibles/lib/biblestab.py index 291930a4b..0ac667697 100644 --- a/openlp/plugins/bibles/lib/biblestab.py +++ b/openlp/plugins/bibles/lib/biblestab.py @@ -31,7 +31,7 @@ import logging from PyQt4 import QtCore, QtGui -from openlp.core.lib import Receiver, SettingsTab, translate, Settings, UiStrings +from openlp.core.lib import Receiver, SettingsTab, Settings, UiStrings, translate from openlp.core.lib.ui import find_and_set_in_combo_box from openlp.plugins.bibles.lib import LayoutStyle, DisplayStyle, update_reference_separators, \ get_reference_separator, LanguageSelection diff --git a/openlp/plugins/bibles/lib/csvbible.py b/openlp/plugins/bibles/lib/csvbible.py index 492702fe7..4f491c5cc 100644 --- a/openlp/plugins/bibles/lib/csvbible.py +++ b/openlp/plugins/bibles/lib/csvbible.py @@ -62,7 +62,7 @@ import logging import chardet import csv -from openlp.core.lib import Receiver, translate +from openlp.core.lib import translate from openlp.plugins.bibles.lib.db import BibleDB, BiblesResourcesDB log = logging.getLogger(__name__) diff --git a/openlp/plugins/bibles/lib/db.py b/openlp/plugins/bibles/lib/db.py index c728aee6a..7b6c94353 100644 --- a/openlp/plugins/bibles/lib/db.py +++ b/openlp/plugins/bibles/lib/db.py @@ -34,7 +34,7 @@ import re import sqlite3 from PyQt4 import QtCore -from sqlalchemy import Column, ForeignKey, or_, Table, types, func +from sqlalchemy import Column, ForeignKey, Table, or_, types, func from sqlalchemy.orm import class_mapper, mapper, relation from sqlalchemy.orm.exc import UnmappedClassError @@ -360,7 +360,7 @@ class BibleDB(QtCore.QObject, Manager): ``book`` The name of the book, according to the selected language. - + ``language_selection`` The language selection the user has chosen in the settings section of the Bible. diff --git a/openlp/plugins/bibles/lib/http.py b/openlp/plugins/bibles/lib/http.py index 799c11129..17791cef3 100644 --- a/openlp/plugins/bibles/lib/http.py +++ b/openlp/plugins/bibles/lib/http.py @@ -38,7 +38,7 @@ from HTMLParser import HTMLParseError from BeautifulSoup import BeautifulSoup, NavigableString, Tag -from openlp.core.lib import Receiver, Registry,translate +from openlp.core.lib import Registry, translate from openlp.core.lib.ui import critical_error_message_box from openlp.core.utils import get_web_page from openlp.plugins.bibles.lib import SearchResults @@ -203,8 +203,7 @@ class BGExtract(object): if clean_verse_num: verse_text = raw_verse_num.next part = raw_verse_num.next.next - while not (isinstance(part, Tag) and - part.get(u'class') == u'versenum'): + while not (isinstance(part, Tag) and part.get(u'class') == u'versenum'): # While we are still in the same verse grab all the text. if isinstance(part, NavigableString): verse_text += part @@ -320,12 +319,10 @@ class BSExtract(object): ``chapter`` Chapter number """ - log.debug(u'BSExtract.get_bible_chapter("%s", "%s", "%s")', version, - book_name, chapter) + log.debug(u'BSExtract.get_bible_chapter("%s", "%s", "%s")', version, book_name, chapter) url_version = urllib.quote(version.encode("utf-8")) url_book_name = urllib.quote(book_name.encode("utf-8")) - chapter_url = u'http://m.bibleserver.com/text/%s/%s%d' % \ - (url_version, url_book_name, chapter) + chapter_url = u'http://m.bibleserver.com/text/%s/%s%d' % (url_version, url_book_name, chapter) header = (u'Accept-Language', u'en') soup = get_soup_for_bible_ref(chapter_url, header) if not soup: @@ -355,8 +352,7 @@ class BSExtract(object): """ log.debug(u'BSExtract.get_books_from_http("%s")', version) urlversion = urllib.quote(version.encode("utf-8")) - chapter_url = u'http://m.bibleserver.com/overlay/selectBook?'\ - 'translation=%s' % (urlversion) + chapter_url = u'http://m.bibleserver.com/overlay/selectBook?translation=%s' % (urlversion) soup = get_soup_for_bible_ref(chapter_url) if not soup: return None @@ -366,9 +362,7 @@ class BSExtract(object): send_error_message(u'parse') return None content = content.findAll(u'li') - return [ - book.contents[0].contents[0] for book in content - ] + return [book.contents[0].contents[0] for book in content] class CWExtract(object): @@ -393,13 +387,11 @@ class CWExtract(object): ``chapter`` Chapter number """ - log.debug(u'CWExtract.get_bible_chapter("%s", "%s", "%s")', version, - book_name, chapter) + log.debug(u'CWExtract.get_bible_chapter("%s", "%s", "%s")', version, book_name, chapter) url_book_name = book_name.replace(u' ', u'-') url_book_name = url_book_name.lower() url_book_name = urllib.quote(url_book_name.encode("utf-8")) - chapter_url = u'http://www.biblestudytools.com/%s/%s/%s.html' % \ - (version, url_book_name, chapter) + chapter_url = u'http://www.biblestudytools.com/%s/%s/%s.html' % (version, url_book_name, chapter) soup = get_soup_for_bible_ref(chapter_url) if not soup: return None @@ -419,18 +411,18 @@ class CWExtract(object): for part in verse.contents: self.application.process_events() if isinstance(part, NavigableString): - verse_text = verse_text + part + verse_text += part elif part and part.attrMap and \ (part.attrMap[u'class'] == u'WordsOfChrist' or part.attrMap[u'class'] == u'strongs'): for subpart in part.contents: self.application.process_events() if isinstance(subpart, NavigableString): - verse_text = verse_text + subpart + verse_text += subpart elif subpart and subpart.attrMap and subpart.attrMap[u'class'] == u'strongs': for subsub in subpart.contents: self.application.process_events() if isinstance(subsub, NavigableString): - verse_text = verse_text + subsub + verse_text += subsub self.application.process_events() # Fix up leading and trailing spaces, multiple spaces, and spaces # between text and , and . @@ -448,8 +440,7 @@ class CWExtract(object): The version of the bible like NIV for New International Version """ log.debug(u'CWExtract.get_books_from_http("%s")', version) - chapter_url = u'http://www.biblestudytools.com/%s/'\ - % (version) + chapter_url = u'http://www.biblestudytools.com/%s/' % (version) soup = get_soup_for_bible_ref(chapter_url) if not soup: return None @@ -503,9 +494,7 @@ class HTTPBible(BibleDB): ``True`` on success, ``False`` on failure. """ self.wizard.progressBar.setMaximum(68) - self.wizard.incrementProgressBar(translate( - 'BiblesPlugin.HTTPBible', - 'Registering Bible and loading books...')) + self.wizard.incrementProgressBar(translate('BiblesPlugin.HTTPBible', 'Registering Bible and loading books...')) self.save_meta(u'download_source', self.download_source) self.save_meta(u'download_name', self.download_name) if self.proxy_server: @@ -527,19 +516,16 @@ class HTTPBible(BibleDB): log.exception(u'Importing books from %s - download name: "%s" '\ 'failed' % (self.download_source, self.download_name)) return False - self.wizard.progressBar.setMaximum(len(books)+2) - self.wizard.incrementProgressBar(translate( - 'BiblesPlugin.HTTPBible', 'Registering Language...')) - bible = BiblesResourcesDB.get_webbible(self.download_name, - self.download_source.lower()) + self.wizard.progressBar.setMaximum(len(books) + 2) + self.wizard.incrementProgressBar(translate( 'BiblesPlugin.HTTPBible', 'Registering Language...')) + bible = BiblesResourcesDB.get_webbible(self.download_name, self.download_source.lower()) if bible[u'language_id']: language_id = bible[u'language_id'] self.save_meta(u'language_id', language_id) else: language_id = self.get_language(bible_name) if not language_id: - log.exception(u'Importing books from %s " '\ - 'failed' % self.filename) + log.exception(u'Importing books from %s failed' % self.filename) return False for book in books: if self.stop_import_flag: @@ -547,8 +533,7 @@ class HTTPBible(BibleDB): self.wizard.incrementProgressBar(translate( 'BiblesPlugin.HTTPBible', 'Importing %s...', 'Importing ...') % book) - book_ref_id = self.get_book_ref_id_by_name(book, len(books), - language_id) + book_ref_id = self.get_book_ref_id_by_name(book, len(books), language_id) if not book_ref_id: log.exception(u'Importing books from %s - download name: "%s" '\ 'failed' % (self.download_source, self.download_name)) @@ -608,8 +593,7 @@ class HTTPBible(BibleDB): self.application.process_events() # Check to see if book/chapter exists. db_book = self.get_book(book_name) - self.create_chapter(db_book.id, search_results.chapter, - search_results.verselist) + self.create_chapter(db_book.id, search_results.chapter, search_results.verselist) self.application.process_events() self.application.set_normal_cursor() self.application.process_events() diff --git a/openlp/plugins/bibles/lib/manager.py b/openlp/plugins/bibles/lib/manager.py index aaf91d2c0..83428c35b 100644 --- a/openlp/plugins/bibles/lib/manager.py +++ b/openlp/plugins/bibles/lib/manager.py @@ -30,7 +30,7 @@ import logging import os -from openlp.core.lib import Receiver, SettingsManager, translate, Settings +from openlp.core.lib import Receiver, SettingsManager, Settings, translate from openlp.core.utils import AppLocation, delete_file from openlp.plugins.bibles.lib import parse_reference, get_reference_separator, LanguageSelection from openlp.plugins.bibles.lib.db import BibleDB, BibleMeta diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py index 13d770909..2df57e626 100644 --- a/openlp/plugins/bibles/lib/mediaitem.py +++ b/openlp/plugins/bibles/lib/mediaitem.py @@ -31,8 +31,8 @@ import logging from PyQt4 import QtCore, QtGui -from openlp.core.lib import MediaManagerItem, Receiver, ItemCapabilities, translate, create_separated_list, \ - ServiceItemContext, Settings, UiStrings +from openlp.core.lib import MediaManagerItem, Receiver, ItemCapabilities, ServiceItemContext, Settings, UiStrings, \ + create_separated_list, translate from openlp.core.lib.searchedit import SearchEdit from openlp.core.lib.ui import set_case_insensitive_completer, create_horizontal_adjusting_combo_box, \ critical_error_message_box, find_and_set_in_combo_box, build_icon diff --git a/openlp/plugins/bibles/lib/openlp1.py b/openlp/plugins/bibles/lib/openlp1.py index 0088c80bd..5100a732f 100644 --- a/openlp/plugins/bibles/lib/openlp1.py +++ b/openlp/plugins/bibles/lib/openlp1.py @@ -31,7 +31,6 @@ import logging import sqlite import sys -from openlp.core.lib import Receiver from openlp.core.ui.wizard import WizardStrings from openlp.plugins.bibles.lib.db import BibleDB, BiblesResourcesDB diff --git a/openlp/plugins/bibles/lib/versereferencelist.py b/openlp/plugins/bibles/lib/versereferencelist.py index 7b936fdc8..1cb76ffff 100644 --- a/openlp/plugins/bibles/lib/versereferencelist.py +++ b/openlp/plugins/bibles/lib/versereferencelist.py @@ -72,12 +72,12 @@ class VerseReferenceList(object): prev = index - 1 if self.verse_list[prev][u'version'] != verse[u'version']: result = u'%s (%s)' % (result, self.verse_list[prev][u'version']) - result = result + u', ' + result += u', ' if self.verse_list[prev][u'book'] != verse[u'book']: result = u'%s%s %s:' % (result, verse[u'book'], verse[u'chapter']) elif self.verse_list[prev][u'chapter'] != verse[u'chapter']: result = u'%s%s:' % (result, verse[u'chapter']) - result = result + str(verse[u'start']) + result += str(verse[u'start']) if verse[u'start'] != verse[u'end']: result = u'%s-%s' % (result, verse[u'end']) if len(self.version_list) > 1: @@ -89,8 +89,8 @@ class VerseReferenceList(object): for index, version in enumerate(self.version_list): if index > 0: if result[-1] not in [u';', u',', u'.']: - result = result + u';' - result = result + u' ' + result += u';' + result += u' ' result = u'%s%s, %s' % (result, version[u'version'], version[u'copyright']) if version[u'permission'].strip(): result = result + u', ' + version[u'permission'] diff --git a/openlp/plugins/custom/forms/editcustomdialog.py b/openlp/plugins/custom/forms/editcustomdialog.py index 5792e7aae..1972228d2 100644 --- a/openlp/plugins/custom/forms/editcustomdialog.py +++ b/openlp/plugins/custom/forms/editcustomdialog.py @@ -29,7 +29,7 @@ from PyQt4 import QtGui -from openlp.core.lib import build_icon, translate, UiStrings +from openlp.core.lib import UiStrings, build_icon, translate from openlp.core.lib.ui import create_button_box, create_button class Ui_CustomEditDialog(object): diff --git a/openlp/plugins/custom/forms/editcustomslidedialog.py b/openlp/plugins/custom/forms/editcustomslidedialog.py index ee47ba52b..972759e7c 100644 --- a/openlp/plugins/custom/forms/editcustomslidedialog.py +++ b/openlp/plugins/custom/forms/editcustomslidedialog.py @@ -29,7 +29,7 @@ from PyQt4 import QtGui -from openlp.core.lib import translate, SpellTextEdit, build_icon, UiStrings +from openlp.core.lib import SpellTextEdit, UiStrings, translate from openlp.core.lib.ui import create_button, create_button_box class Ui_CustomSlideEditDialog(object): diff --git a/openlp/plugins/custom/lib/customtab.py b/openlp/plugins/custom/lib/customtab.py index 5b0b7f11f..ba57a6fc2 100644 --- a/openlp/plugins/custom/lib/customtab.py +++ b/openlp/plugins/custom/lib/customtab.py @@ -33,7 +33,7 @@ for the Custom Slides plugin, which is inserted into the configuration dialog. from PyQt4 import QtCore, QtGui -from openlp.core.lib import SettingsTab, translate, Settings +from openlp.core.lib import SettingsTab, Settings, translate class CustomTab(SettingsTab): """ diff --git a/openlp/plugins/custom/lib/mediaitem.py b/openlp/plugins/custom/lib/mediaitem.py index 7b87dbef5..369d3e419 100644 --- a/openlp/plugins/custom/lib/mediaitem.py +++ b/openlp/plugins/custom/lib/mediaitem.py @@ -32,8 +32,8 @@ import logging from PyQt4 import QtCore, QtGui from sqlalchemy.sql import or_, func, and_ -from openlp.core.lib import MediaManagerItem, Receiver, ItemCapabilities, check_item_selected, translate, \ - ServiceItemContext, Settings, PluginStatus, UiStrings +from openlp.core.lib import MediaManagerItem, Receiver, ItemCapabilities, ServiceItemContext, Settings, PluginStatus, \ + UiStrings, check_item_selected, translate from openlp.plugins.custom.forms import EditCustomForm from openlp.plugins.custom.lib import CustomXMLParser, CustomXMLBuilder from openlp.plugins.custom.lib.db import CustomSlide diff --git a/openlp/plugins/images/imageplugin.py b/openlp/plugins/images/imageplugin.py index 0827e645c..0f2829dbc 100644 --- a/openlp/plugins/images/imageplugin.py +++ b/openlp/plugins/images/imageplugin.py @@ -31,7 +31,7 @@ from PyQt4 import QtCore, QtGui import logging -from openlp.core.lib import Plugin, StringContent, build_icon, translate, Receiver, ImageSource, Settings +from openlp.core.lib import Plugin, StringContent, Receiver, ImageSource, Settings, build_icon, translate from openlp.plugins.images.lib import ImageMediaItem, ImageTab log = logging.getLogger(__name__) diff --git a/openlp/plugins/images/lib/imagetab.py b/openlp/plugins/images/lib/imagetab.py index 8e3f1c657..ce3e9b957 100644 --- a/openlp/plugins/images/lib/imagetab.py +++ b/openlp/plugins/images/lib/imagetab.py @@ -29,7 +29,7 @@ from PyQt4 import QtCore, QtGui -from openlp.core.lib import SettingsTab, translate, Receiver, Settings, UiStrings +from openlp.core.lib import SettingsTab, Receiver, Settings, UiStrings, translate class ImageTab(SettingsTab): """ diff --git a/openlp/plugins/images/lib/mediaitem.py b/openlp/plugins/images/lib/mediaitem.py index 64ba220c0..0ab73aa46 100644 --- a/openlp/plugins/images/lib/mediaitem.py +++ b/openlp/plugins/images/lib/mediaitem.py @@ -32,9 +32,9 @@ import os from PyQt4 import QtCore, QtGui -from openlp.core.lib import MediaManagerItem, build_icon, ItemCapabilities, SettingsManager, translate, \ - check_item_selected, check_directory_exists, Receiver, create_thumb, validate_thumb, ServiceItemContext, Settings, \ - UiStrings +from openlp.core.lib import MediaManagerItem, ItemCapabilities, Receiver, SettingsManager, ServiceItemContext, \ + Settings, UiStrings, build_icon, check_item_selected, check_directory_exists, create_thumb, translate, \ + validate_thumb from openlp.core.lib.ui import critical_error_message_box from openlp.core.utils import AppLocation, delete_file, locale_compare, get_images_filter diff --git a/openlp/plugins/media/lib/mediaitem.py b/openlp/plugins/media/lib/mediaitem.py index deca81f77..02d624c1e 100644 --- a/openlp/plugins/media/lib/mediaitem.py +++ b/openlp/plugins/media/lib/mediaitem.py @@ -32,9 +32,8 @@ import os from PyQt4 import QtCore, QtGui -from openlp.core.lib import MediaManagerItem, build_icon, ItemCapabilities, SettingsManager, translate, \ - check_item_selected, Receiver, MediaType, ServiceItem, ServiceItemContext, Settings, UiStrings, \ - check_directory_exists +from openlp.core.lib import ItemCapabilities, MediaManagerItem,MediaType, Receiver, ServiceItem, ServiceItemContext, \ + Settings, UiStrings, build_icon, check_item_selected, check_directory_exists, translate from openlp.core.lib.ui import critical_error_message_box, create_horizontal_adjusting_combo_box from openlp.core.ui import DisplayController, Display, DisplayControllerType from openlp.core.ui.media import get_media_players, set_media_players diff --git a/openlp/plugins/media/lib/mediatab.py b/openlp/plugins/media/lib/mediatab.py index 87a56f238..69a21d0a4 100644 --- a/openlp/plugins/media/lib/mediatab.py +++ b/openlp/plugins/media/lib/mediatab.py @@ -27,11 +27,9 @@ # Temple Place, Suite 330, Boston, MA 02111-1307 USA # ############################################################################### -from PyQt4 import QtCore, QtGui +from PyQt4 import QtGui -from openlp.core.lib import Receiver, Settings, SettingsTab, translate, UiStrings -from openlp.core.lib.ui import create_button -from openlp.core.ui.media import get_media_players, set_media_players +from openlp.core.lib import Receiver, Settings, SettingsTab, UiStrings, translate class MediaQCheckBox(QtGui.QCheckBox): """ diff --git a/openlp/plugins/media/mediaplugin.py b/openlp/plugins/media/mediaplugin.py index 2a1fcf112..bb463b857 100644 --- a/openlp/plugins/media/mediaplugin.py +++ b/openlp/plugins/media/mediaplugin.py @@ -31,7 +31,7 @@ import logging from PyQt4 import QtCore -from openlp.core.lib import Plugin, StringContent, build_icon, translate, Settings, Registry +from openlp.core.lib import Plugin, Registry, StringContent, Settings, build_icon, translate from openlp.plugins.media.lib import MediaMediaItem, MediaTab log = logging.getLogger(__name__) diff --git a/openlp/plugins/presentations/lib/impresscontroller.py b/openlp/plugins/presentations/lib/impresscontroller.py index c19653b78..5a8106f7d 100644 --- a/openlp/plugins/presentations/lib/impresscontroller.py +++ b/openlp/plugins/presentations/lib/impresscontroller.py @@ -189,7 +189,7 @@ class ImpressController(PresentationController): while list.hasMoreElements(): doc = list.nextElement() if doc.getImplementationName() != u'com.sun.star.comp.framework.BackingComp': - cnt = cnt + 1 + cnt += 1 if cnt > 0: log.debug(u'OpenOffice not terminated as docs are still open') else: @@ -399,7 +399,7 @@ class ImpressDocument(PresentationDocument): i = 1 while not self.control and i < 150: time.sleep(0.1) - i = i + 1 + i += 1 self.control = self.presentation.getController() else: self.control.activate() diff --git a/openlp/plugins/presentations/lib/mediaitem.py b/openlp/plugins/presentations/lib/mediaitem.py index ad48a4d8c..1875ca66c 100644 --- a/openlp/plugins/presentations/lib/mediaitem.py +++ b/openlp/plugins/presentations/lib/mediaitem.py @@ -32,8 +32,8 @@ import os from PyQt4 import QtCore, QtGui -from openlp.core.lib import MediaManagerItem, build_icon, SettingsManager, translate, check_item_selected, Receiver, \ - ItemCapabilities, create_thumb, validate_thumb, ServiceItemContext, Settings, UiStrings +from openlp.core.lib import MediaManagerItem, Receiver, ItemCapabilities, ServiceItemContext, Settings, UiStrings, \ + build_icon, check_item_selected, create_thumb, translate, validate_thumb from openlp.core.lib.ui import critical_error_message_box, create_horizontal_adjusting_combo_box from openlp.core.utils import locale_compare from openlp.plugins.presentations.lib import MessageListener @@ -269,7 +269,7 @@ class PresentationMediaItem(MediaManagerItem): if img: while img: service_item.add_from_command(path, name, img) - i = i + 1 + i += 1 img = doc.get_thumbnail_path(i, True) doc.close_presentation() return True diff --git a/openlp/plugins/presentations/lib/messagelistener.py b/openlp/plugins/presentations/lib/messagelistener.py index 3063bfa7b..cde59209a 100644 --- a/openlp/plugins/presentations/lib/messagelistener.py +++ b/openlp/plugins/presentations/lib/messagelistener.py @@ -177,7 +177,7 @@ class Controller(object): if not self.doc.is_active(): return if self.doc.slidenumber < self.doc.get_slide_count(): - self.doc.slidenumber = self.doc.slidenumber + 1 + self.doc.slidenumber += 1 self.poll() return if not self.activate(): @@ -203,7 +203,7 @@ class Controller(object): if not self.doc.is_active(): return if self.doc.slidenumber > 1: - self.doc.slidenumber = self.doc.slidenumber - 1 + self.doc.slidenumber -= 1 self.poll() return if not self.activate(): diff --git a/openlp/plugins/presentations/lib/pptviewlib/ppttest.py b/openlp/plugins/presentations/lib/pptviewlib/ppttest.py index 5ec629840..c8573c807 100644 --- a/openlp/plugins/presentations/lib/pptviewlib/ppttest.py +++ b/openlp/plugins/presentations/lib/pptviewlib/ppttest.py @@ -71,35 +71,35 @@ class PPTViewer(QtGui.QWidget): row = 0 grid.addWidget(folder_label, 0, 0) grid.addWidget(self.folderEdit, 0, 1) - row = row + 1 + row += 1 grid.addWidget(x_label, row, 0) grid.addWidget(self.xEdit, row, 1) grid.addWidget(y_label, row, 2) grid.addWidget(self.yEdit, row, 3) - row = row + 1 + row += 1 grid.addWidget(width_label, row, 0) grid.addWidget(self.widthEdit, row, 1) grid.addWidget(height_label, row, 2) grid.addWidget(self.heightEdit, row, 3) - row = row + 1 + row += 1 grid.addWidget(ppt_label, row, 0) grid.addWidget(self.pptEdit, row, 1) grid.addWidget(ppt_dlg_btn, row, 2) grid.addWidget(ppt_btn, row, 3) - row = row + 1 + row += 1 grid.addWidget(slide_label, row, 0) grid.addWidget(self.slideEdit, row, 1) grid.addWidget(slide_btn, row, 2) - row = row + 1 + row += 1 grid.addWidget(prev, row, 0) grid.addWidget(next, row, 1) - row = row + 1 + row += 1 grid.addWidget(blank, row, 0) grid.addWidget(unblank, row, 1) - row = row + 1 + row += 1 grid.addWidget(restart, row, 0) grid.addWidget(close, row, 1) - row = row + 1 + row += 1 grid.addWidget(stop, row, 0) grid.addWidget(resume, row, 1) self.connect(ppt_btn, QtCore.SIGNAL(u'clicked()'), self.openClick) diff --git a/openlp/plugins/presentations/lib/presentationcontroller.py b/openlp/plugins/presentations/lib/presentationcontroller.py index 8f468de63..fad88d7cd 100644 --- a/openlp/plugins/presentations/lib/presentationcontroller.py +++ b/openlp/plugins/presentations/lib/presentationcontroller.py @@ -33,7 +33,7 @@ import shutil from PyQt4 import QtCore -from openlp.core.lib import Receiver, Registry, check_directory_exists, create_thumb, validate_thumb, Settings +from openlp.core.lib import Receiver, Registry, Settings, check_directory_exists, create_thumb, validate_thumb from openlp.core.utils import AppLocation log = logging.getLogger(__name__) diff --git a/openlp/plugins/presentations/lib/presentationtab.py b/openlp/plugins/presentations/lib/presentationtab.py index c72676860..15b3b2590 100644 --- a/openlp/plugins/presentations/lib/presentationtab.py +++ b/openlp/plugins/presentations/lib/presentationtab.py @@ -27,9 +27,9 @@ # Temple Place, Suite 330, Boston, MA 02111-1307 USA # ############################################################################### -from PyQt4 import QtCore, QtGui +from PyQt4 import QtGui -from openlp.core.lib import Receiver, Settings, SettingsTab, translate, UiStrings +from openlp.core.lib import Receiver, Settings, SettingsTab, UiStrings, translate class PresentationTab(SettingsTab): """ diff --git a/openlp/plugins/remotes/lib/httpserver.py b/openlp/plugins/remotes/lib/httpserver.py index af12cc9c4..d444fc1c4 100644 --- a/openlp/plugins/remotes/lib/httpserver.py +++ b/openlp/plugins/remotes/lib/httpserver.py @@ -138,7 +138,9 @@ class HttpResponse(object): 'Content-Type': 'text/html; charset="utf-8"\r\n' } - def __init__(self, content='', headers={}, code=None): + def __init__(self, content='', headers=None, code=None): + if headers is None: + headers = {} self.content = content for key, value in headers.iteritems(): self.headers[key] = value diff --git a/openlp/plugins/remotes/lib/remotetab.py b/openlp/plugins/remotes/lib/remotetab.py index 1d28355c4..2e42a2b1e 100644 --- a/openlp/plugins/remotes/lib/remotetab.py +++ b/openlp/plugins/remotes/lib/remotetab.py @@ -29,7 +29,7 @@ from PyQt4 import QtCore, QtGui, QtNetwork -from openlp.core.lib import Settings, SettingsTab, translate, Receiver +from openlp.core.lib import Settings, SettingsTab, Receiver, translate ZERO_URL = u'0.0.0.0' @@ -133,7 +133,7 @@ class RemoteTab(SettingsTab): ipAddress = self.addressEdit.text() url = u'http://%s:%s/' % (ipAddress, self.portSpinBox.value()) self.remoteUrl.setText(u'%s' % (url, url)) - url = url + u'stage' + url += u'stage' self.stageUrl.setText(u'%s' % (url, url)) def load(self): diff --git a/openlp/plugins/songs/forms/editsongdialog.py b/openlp/plugins/songs/forms/editsongdialog.py index 3f6e1e61a..76f190931 100644 --- a/openlp/plugins/songs/forms/editsongdialog.py +++ b/openlp/plugins/songs/forms/editsongdialog.py @@ -29,7 +29,7 @@ from PyQt4 import QtCore, QtGui -from openlp.core.lib import build_icon, translate, UiStrings +from openlp.core.lib import UiStrings, build_icon, translate from openlp.core.lib.ui import create_button_box, create_button from openlp.plugins.songs.lib.ui import SongStrings diff --git a/openlp/plugins/songs/forms/editsongform.py b/openlp/plugins/songs/forms/editsongform.py index 253225411..46ea0029c 100644 --- a/openlp/plugins/songs/forms/editsongform.py +++ b/openlp/plugins/songs/forms/editsongform.py @@ -38,9 +38,9 @@ import shutil from PyQt4 import QtCore, QtGui -from openlp.core.lib import PluginStatus, Receiver, MediaType, translate, create_separated_list, \ - check_directory_exists, Registry, UiStrings -from openlp.core.lib.ui import UiStrings, set_case_insensitive_completer, critical_error_message_box, \ +from openlp.core.lib import PluginStatus, Receiver, MediaType, Registry, UiStrings, translate, create_separated_list, \ + check_directory_exists +from openlp.core.lib.ui import set_case_insensitive_completer, critical_error_message_box, \ find_and_set_in_combo_box from openlp.core.utils import AppLocation from openlp.plugins.songs.forms import EditVerseForm, MediaFilesForm diff --git a/openlp/plugins/songs/forms/editversedialog.py b/openlp/plugins/songs/forms/editversedialog.py index 603af2180..e97a898f7 100644 --- a/openlp/plugins/songs/forms/editversedialog.py +++ b/openlp/plugins/songs/forms/editversedialog.py @@ -29,8 +29,8 @@ from PyQt4 import QtGui -from openlp.core.lib import build_icon, translate, SpellTextEdit -from openlp.core.lib.ui import create_button_box, UiStrings +from openlp.core.lib import SpellTextEdit, build_icon, translate +from openlp.core.lib.ui import UiStrings, create_button_box from openlp.plugins.songs.lib import VerseType class Ui_EditVerseDialog(object): diff --git a/openlp/plugins/songs/forms/editverseform.py b/openlp/plugins/songs/forms/editverseform.py index d39f84de2..6e5c0127e 100644 --- a/openlp/plugins/songs/forms/editverseform.py +++ b/openlp/plugins/songs/forms/editverseform.py @@ -32,8 +32,7 @@ import logging from PyQt4 import QtCore, QtGui -from openlp.core.lib.ui import critical_error_message_box -from openlp.plugins.songs.lib import VerseType, translate +from openlp.plugins.songs.lib import VerseType from editversedialog import Ui_EditVerseDialog diff --git a/openlp/plugins/songs/forms/songexportform.py b/openlp/plugins/songs/forms/songexportform.py index 2a1564f8b..f4773b3da 100644 --- a/openlp/plugins/songs/forms/songexportform.py +++ b/openlp/plugins/songs/forms/songexportform.py @@ -34,7 +34,7 @@ import logging from PyQt4 import QtCore, QtGui -from openlp.core.lib import build_icon, Receiver, translate, create_separated_list, UiStrings +from openlp.core.lib import Receiver, UiStrings, create_separated_list, build_icon, translate from openlp.core.lib.ui import critical_error_message_box from openlp.core.ui.wizard import OpenLPWizard, WizardStrings from openlp.plugins.songs.lib import natcmp diff --git a/openlp/plugins/songs/forms/songimportform.py b/openlp/plugins/songs/forms/songimportform.py index 9a842f401..b635b309b 100644 --- a/openlp/plugins/songs/forms/songimportform.py +++ b/openlp/plugins/songs/forms/songimportform.py @@ -35,7 +35,7 @@ import os from PyQt4 import QtCore, QtGui -from openlp.core.lib import Settings, translate, UiStrings +from openlp.core.lib import Settings, UiStrings, translate from openlp.core.lib.ui import critical_error_message_box from openlp.core.ui.wizard import OpenLPWizard, WizardStrings from openlp.plugins.songs.lib.importer import SongFormat, SongFormatSelect diff --git a/openlp/plugins/songs/forms/songmaintenancedialog.py b/openlp/plugins/songs/forms/songmaintenancedialog.py index 389579284..2f7ad7915 100644 --- a/openlp/plugins/songs/forms/songmaintenancedialog.py +++ b/openlp/plugins/songs/forms/songmaintenancedialog.py @@ -29,7 +29,7 @@ from PyQt4 import QtCore, QtGui -from openlp.core.lib import build_icon, UiStrings +from openlp.core.lib import UiStrings, build_icon from openlp.core.lib.ui import create_button_box from openlp.plugins.songs.lib.ui import SongStrings diff --git a/openlp/plugins/songs/forms/songmaintenanceform.py b/openlp/plugins/songs/forms/songmaintenanceform.py index 9d0c0c306..546791778 100644 --- a/openlp/plugins/songs/forms/songmaintenanceform.py +++ b/openlp/plugins/songs/forms/songmaintenanceform.py @@ -31,7 +31,7 @@ import logging from PyQt4 import QtGui, QtCore from sqlalchemy.sql import and_ -from openlp.core.lib import Receiver, translate, UiStrings +from openlp.core.lib import Receiver, UiStrings, translate from openlp.core.lib.ui import critical_error_message_box from openlp.plugins.songs.forms import AuthorsForm, TopicsForm, SongBookForm from openlp.plugins.songs.lib.db import Author, Book, Topic, Song @@ -517,4 +517,4 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog): self._application = Registry().get(u'application') return self._application - application = property(_get_application) \ No newline at end of file + application = property(_get_application) diff --git a/openlp/plugins/songs/lib/__init__.py b/openlp/plugins/songs/lib/__init__.py index 39ecb0ae2..c7c24533b 100644 --- a/openlp/plugins/songs/lib/__init__.py +++ b/openlp/plugins/songs/lib/__init__.py @@ -571,6 +571,8 @@ def strip_rtf(text, default_encoding=None): while True: try: encoding, default_encoding = get_encoding(font, font_table, default_encoding, failed=failed) + if not encoding: + return None out.append(chr(charcode).decode(encoding)) except UnicodeDecodeError: failed = True diff --git a/openlp/plugins/songs/lib/easyslidesimport.py b/openlp/plugins/songs/lib/easyslidesimport.py index 207628b9f..7f9143b70 100644 --- a/openlp/plugins/songs/lib/easyslidesimport.py +++ b/openlp/plugins/songs/lib/easyslidesimport.py @@ -162,7 +162,7 @@ class EasySlidesImport(SongImport): region = self._extractRegion(line) regionlines[region] = 1 + regionlines.get(region, 0) elif line[0] == u'[': - separatorlines = separatorlines + 1 + separatorlines += 1 # if the song has separators separators = (separatorlines > 0) # the number of different regions in song - 1 @@ -200,7 +200,7 @@ class EasySlidesImport(SongImport): # separators are used, so empty line means slide break # inside verse if self._listHas(verses, [reg, vt, vn, inst]): - inst = inst + 1 + inst += 1 else: # separators are not used, so empty line starts a new verse vt = u'V' diff --git a/openlp/plugins/songs/lib/ewimport.py b/openlp/plugins/songs/lib/ewimport.py index 3289c0e7f..86fba0562 100644 --- a/openlp/plugins/songs/lib/ewimport.py +++ b/openlp/plugins/songs/lib/ewimport.py @@ -174,7 +174,10 @@ class EasyWorshipSongImport(SongImport): self.addAuthor(author_name.strip()) if words: # Format the lyrics - words, self.encoding = strip_rtf(words, self.encoding) + result = strip_rtf(words, self.encoding) + if result is None: + return + words, self.encoding = result verse_type = VerseType.Tags[VerseType.Verse] for verse in SLIDE_BREAK_REGEX.split(words): verse = verse.strip() diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py index 883865bb8..6c38c84da 100644 --- a/openlp/plugins/songs/lib/mediaitem.py +++ b/openlp/plugins/songs/lib/mediaitem.py @@ -35,8 +35,8 @@ import shutil from PyQt4 import QtCore, QtGui from sqlalchemy.sql import or_ -from openlp.core.lib import MediaManagerItem, Receiver, ItemCapabilities, translate, check_item_selected, \ - PluginStatus, create_separated_list, check_directory_exists, ServiceItemContext, Settings, UiStrings +from openlp.core.lib import MediaManagerItem, Receiver, ItemCapabilities, PluginStatus, ServiceItemContext, Settings, \ + UiStrings, translate, check_item_selected, create_separated_list, check_directory_exists from openlp.core.lib.ui import create_widget_action from openlp.core.utils import AppLocation from openlp.plugins.songs.forms import EditSongForm, SongMaintenanceForm, SongImportForm, SongExportForm diff --git a/openlp/plugins/songs/lib/songproimport.py b/openlp/plugins/songs/lib/songproimport.py index 7556454d8..0e6b5ee97 100644 --- a/openlp/plugins/songs/lib/songproimport.py +++ b/openlp/plugins/songs/lib/songproimport.py @@ -107,7 +107,10 @@ class SongProImport(SongImport): self.finish() return if u'rtf1' in text: - text, self.encoding = strip_rtf(text, self.encoding) + result = strip_rtf(text, self.encoding) + if result is None: + return + text, self.encoding = result text = text.rstrip() if not text: return diff --git a/openlp/plugins/songs/lib/songshowplusimport.py b/openlp/plugins/songs/lib/songshowplusimport.py index ae7e403f7..8677c82c2 100644 --- a/openlp/plugins/songs/lib/songshowplusimport.py +++ b/openlp/plugins/songs/lib/songshowplusimport.py @@ -203,7 +203,7 @@ class SongShowPlusImport(SongImport): if verse_name not in self.otherList: if ignore_unique: return None - self.otherCount = self.otherCount + 1 + self.otherCount += 1 self.otherList[verse_name] = str(self.otherCount) verse_tag = VerseType.Tags[VerseType.Other] verse_number = self.otherList[verse_name] diff --git a/openlp/plugins/songs/lib/sundayplusimport.py b/openlp/plugins/songs/lib/sundayplusimport.py index 14bac8526..5ac69e991 100644 --- a/openlp/plugins/songs/lib/sundayplusimport.py +++ b/openlp/plugins/songs/lib/sundayplusimport.py @@ -121,7 +121,7 @@ class SundayPlusImport(SongImport): end = data.find(')', i) + 1 value = data[i:end] # If we are in the main group. - if cell == False: + if not cell: if name == 'title': self.title = self.decode(self.unescape(value)) elif name == 'Author': @@ -148,7 +148,10 @@ class SundayPlusImport(SongImport): verse_type = HOTKEY_TO_VERSE_TYPE[value] if name == 'rtf': value = self.unescape(value) - verse, self.encoding = strip_rtf(value, self.encoding) + result = strip_rtf(value, self.encoding) + if result is None: + return + verse, self.encoding = result lines = verse.strip().split('\n') # If any line inside any verse contains CCLI or # only Public Domain, we treat this as special data: diff --git a/openlp/plugins/songs/lib/test/test_import_file.py b/openlp/plugins/songs/lib/test/test_import_file.py index 231ca1a21..06d1af38f 100644 --- a/openlp/plugins/songs/lib/test/test_import_file.py +++ b/openlp/plugins/songs/lib/test/test_import_file.py @@ -36,7 +36,7 @@ import logging LOG_FILENAME = 'test_import_file.log' logging.basicConfig(filename=LOG_FILENAME,level=logging.INFO) -from test_opensongimport import wizard_stub, progbar_stub +from test_opensongimport import wizard_stub def test(filenames): manager = Manager(u'songs', init_schema) diff --git a/openlp/plugins/songs/lib/test/test_importing_lots.py b/openlp/plugins/songs/lib/test/test_importing_lots.py index b0e0b34dc..f6bac243b 100644 --- a/openlp/plugins/songs/lib/test/test_importing_lots.py +++ b/openlp/plugins/songs/lib/test/test_importing_lots.py @@ -30,18 +30,14 @@ from openlp.plugins.songs.lib.opensongimport import OpenSongImport from openlp.plugins.songs.lib.db import init_schema from openlp.core.lib.db import Manager -from glob import glob -from zipfile import ZipFile import os -from traceback import print_exc -import sys import codecs import logging LOG_FILENAME = 'import.log' logging.basicConfig(filename=LOG_FILENAME,level=logging.INFO) -from test_opensongimport import wizard_stub, progbar_stub +from test_opensongimport import wizard_stub # Useful test function for importing a variety of different files # Uncomment below depending on what problem trying to make occur! diff --git a/openlp/plugins/songs/lib/xml.py b/openlp/plugins/songs/lib/xml.py index 859bef075..22a4d803f 100644 --- a/openlp/plugins/songs/lib/xml.py +++ b/openlp/plugins/songs/lib/xml.py @@ -69,7 +69,7 @@ import re from lxml import etree, objectify from openlp.core.lib import FormattingTags, translate -from openlp.plugins.songs.lib import clean_song, VerseType +from openlp.plugins.songs.lib import VerseType, clean_song from openlp.plugins.songs.lib.db import Author, Book, Song, Topic from openlp.core.utils import get_application_version diff --git a/openlp/plugins/songs/songsplugin.py b/openlp/plugins/songs/songsplugin.py index 937e5b374..74a5ce216 100644 --- a/openlp/plugins/songs/songsplugin.py +++ b/openlp/plugins/songs/songsplugin.py @@ -38,7 +38,7 @@ import sqlite3 from PyQt4 import QtCore, QtGui -from openlp.core.lib import Plugin, StringContent, build_icon, translate, UiStrings +from openlp.core.lib import Plugin, StringContent, UiStrings, build_icon, translate from openlp.core.lib.db import Manager from openlp.core.lib.ui import create_action from openlp.core.utils import get_filesystem_encoding diff --git a/openlp/plugins/songusage/forms/songusagedeleteform.py b/openlp/plugins/songusage/forms/songusagedeleteform.py index 8174060bd..b13be8ad2 100644 --- a/openlp/plugins/songusage/forms/songusagedeleteform.py +++ b/openlp/plugins/songusage/forms/songusagedeleteform.py @@ -29,7 +29,7 @@ from PyQt4 import QtCore, QtGui -from openlp.core.lib import translate, Receiver +from openlp.core.lib import Receiver, translate from openlp.plugins.songusage.lib.db import SongUsageItem from songusagedeletedialog import Ui_SongUsageDeleteDialog diff --git a/openlp/plugins/songusage/songusageplugin.py b/openlp/plugins/songusage/songusageplugin.py index 398997715..3b3611f0e 100644 --- a/openlp/plugins/songusage/songusageplugin.py +++ b/openlp/plugins/songusage/songusageplugin.py @@ -32,7 +32,7 @@ from datetime import datetime from PyQt4 import QtCore, QtGui -from openlp.core.lib import build_icon, Plugin, Receiver, Settings, StringContent, translate +from openlp.core.lib import Plugin, Receiver, Settings, StringContent, build_icon, translate from openlp.core.lib.db import Manager from openlp.core.lib.ui import create_action from openlp.core.utils.actions import ActionList diff --git a/scripts/openlp-remoteclient.py b/scripts/openlp-remoteclient.py deleted file mode 100644 index d29ddd501..000000000 --- a/scripts/openlp-remoteclient.py +++ /dev/null @@ -1,70 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- -# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 - -############################################################################### -# OpenLP - Open Source Lyrics Projection # -# --------------------------------------------------------------------------- # -# Copyright (c) 2008-2013 Raoul Snyman # -# Portions copyright (c) 2008-2013 Tim Bentley, Gerald Britton, Jonathan # -# Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub, # -# Meinert Jordan, Armin Köhler, Erik Lundin, Edwin Lunando, Brian T. Meyer. # -# Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru, # -# Christian Richter, Philip Ridout, Simon Scudder, Jeffrey Smith, # -# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Dave Warnock, # -# Frode Woldsund, Martin Zibricky, Patrick Zimmermann # -# --------------------------------------------------------------------------- # -# This program is free software; you can redistribute it and/or modify it # -# under the terms of the GNU General Public License as published by the Free # -# Software Foundation; version 2 of the License. # -# # -# This program is distributed in the hope that it will be useful, but WITHOUT # -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # -# more details. # -# # -# You should have received a copy of the GNU General Public License along # -# with this program; if not, write to the Free Software Foundation, Inc., 59 # -# Temple Place, Suite 330, Boston, MA 02111-1307 USA # -############################################################################### - -import urllib -import sys -from optparse import OptionParser - -def sendData(options): - addr = 'http://%s:%s/send/%s?q=%s' % (options.address, options.port, - options.event, options.message) - try: - urllib.urlopen(addr) - print u'Message sent ', addr - except: - print u'Error thrown ', sys.exc_info()[1] - -def main(): - usage = "usage: %prog [-a address] [-p port] [-e event] [-m message]" - parser = OptionParser(usage=usage) - parser.add_option("-p", "--port", default=4316, - help="IP Port number %default ") - parser.add_option("-a", "--address", - help="Recipient address ", - default="localhost") - parser.add_option("-e", "--event", - help="Action to be performed", - default="alerts_text") - parser.add_option("-m", "--message", - help="Message to be passed for the action", - default="") - - (options, args) = parser.parse_args() - if args: - parser.print_help() - parser.error("incorrect number of arguments") - elif options.address is None: - parser.print_help() - parser.error("IP address missing") - else: - sendData(options) - -if __name__ == u'__main__': - main() diff --git a/scripts/translation_utils.py b/scripts/translation_utils.py index dc1d47189..40000946d 100755 --- a/scripts/translation_utils.py +++ b/scripts/translation_utils.py @@ -53,8 +53,6 @@ This is done easily via the ``-d``, ``-p`` and ``-u`` options:: """ import os import urllib2 -import re -from shutil import copy from getpass import getpass import base64 import json @@ -62,7 +60,6 @@ import webbrowser from optparse import OptionParser from PyQt4 import QtCore -from BeautifulSoup import BeautifulSoup SERVER_URL = u'http://www.transifex.net/api/2/project/openlp/' IGNORED_PATHS = [u'scripts'] @@ -162,7 +159,7 @@ def print_verbose(text): """ global verbose_mode, quiet_mode if not quiet_mode and verbose_mode: - print u' %s' % text + print(u' %s' % text) def run(command): """ @@ -269,8 +266,7 @@ def prepare_project(): def update_translations(): print_quiet(u'Update the translation files') if not os.path.exists(os.path.join(os.path.abspath(u'..'), u'openlp.pro')): - print u'You have not generated a project file yet, please run this ' + \ - u'script with the -p option.' + print(u'You have not generated a project file yet, please run this script with the -p option.') return else: os.chdir(os.path.abspath(u'..')) @@ -280,10 +276,8 @@ def update_translations(): def generate_binaries(): print_quiet(u'Generate the related *.qm files') if not os.path.exists(os.path.join(os.path.abspath(u'..'), u'openlp.pro')): - print u'You have not generated a project file yet, please run this ' + \ - u'script with the -p option. It is also recommended that you ' + \ - u'this script with the -u option to update the translation ' + \ - u'files as well.' + print(u'You have not generated a project file yet, please run this script with the -p option. It is also ' + + u'recommended that you this script with the -u option to update the translation files as well.') return else: os.chdir(os.path.abspath(u'..')) @@ -383,6 +377,6 @@ def main(): if __name__ == u'__main__': if os.path.split(os.path.abspath(u'.'))[1] != u'scripts': - print u'You need to run this script from the scripts directory.' + print(u'You need to run this script from the scripts directory.') else: main() diff --git a/tests/interfaces/openlp_core_ui/test_starttimedialog.py b/tests/interfaces/openlp_core_ui/test_starttimedialog.py index 918c6637c..990f753ba 100644 --- a/tests/interfaces/openlp_core_ui/test_starttimedialog.py +++ b/tests/interfaces/openlp_core_ui/test_starttimedialog.py @@ -1,7 +1,6 @@ """ Package to test the openlp.core.ui package. """ -import sys from unittest import TestCase from mock import MagicMock, patch