Jon Tibble has proposed merging lp:~meths/openlp/testing into lp:openlp.
Requested reviews:
Tim Bentley (trb143)
For more details, see:
https://code.launchpad.net/~meths/openlp/testing/+merge/68177
Cleanups
Resubmit: Remove unused string_is_unicode function
--
https://code.launchpad.net/~meths/openlp/testing/+merge/68177
Your team OpenLP Core is subscribed to branch lp:openlp.
=== modified file 'openlp/core/lib/pluginmanager.py'
--- openlp/core/lib/pluginmanager.py 2011-06-12 16:02:52 +0000
+++ openlp/core/lib/pluginmanager.py 2011-07-17 15:23:31 +0000
@@ -31,7 +31,7 @@
import sys
import logging
-from openlp.core.lib import Plugin, StringContent, PluginStatus
+from openlp.core.lib import Plugin, PluginStatus
log = logging.getLogger(__name__)
=== modified file 'openlp/core/lib/serviceitem.py'
--- openlp/core/lib/serviceitem.py 2011-07-10 11:59:23 +0000
+++ openlp/core/lib/serviceitem.py 2011-07-17 15:23:31 +0000
@@ -36,7 +36,6 @@
import uuid
from openlp.core.lib import build_icon, clean_tags, expand_tags, translate
-from openlp.core.lib.ui import UiStrings
log = logging.getLogger(__name__)
=== modified file 'openlp/core/lib/spelltextedit.py'
--- openlp/core/lib/spelltextedit.py 2011-06-23 05:26:20 +0000
+++ openlp/core/lib/spelltextedit.py 2011-07-17 15:23:31 +0000
@@ -57,7 +57,7 @@
self.dictionary = enchant.Dict()
self.highlighter = Highlighter(self.document())
self.highlighter.spellingDictionary = self.dictionary
- except Error, DictNotFoundError:
+ except (Error, DictNotFoundError):
ENCHANT_AVAILABLE = False
log.debug(u'Could not load default dictionary')
=== modified file 'openlp/core/lib/theme.py'
--- openlp/core/lib/theme.py 2011-06-26 16:15:13 +0000
+++ openlp/core/lib/theme.py 2011-07-17 15:23:31 +0000
@@ -34,8 +34,7 @@
from xml.dom.minidom import Document
from lxml import etree, objectify
-from openlp.core.lib import str_to_bool, translate
-from openlp.core.lib.ui import UiStrings
+from openlp.core.lib import str_to_bool
log = logging.getLogger(__name__)
=== modified file 'openlp/core/ui/displaytagdialog.py'
--- openlp/core/ui/displaytagdialog.py 2011-06-26 14:37:38 +0000
+++ openlp/core/ui/displaytagdialog.py 2011-07-17 15:23:31 +0000
@@ -28,7 +28,7 @@
from PyQt4 import QtCore, QtGui
from openlp.core.lib import translate
-from openlp.core.lib.ui import UiStrings, create_accept_reject_button_box
+from openlp.core.lib.ui import UiStrings
class Ui_DisplayTagDialog(object):
=== modified file 'openlp/core/ui/firsttimewizard.py'
--- openlp/core/ui/firsttimewizard.py 2011-07-11 16:32:25 +0000
+++ openlp/core/ui/firsttimewizard.py 2011-07-17 15:23:31 +0000
@@ -49,7 +49,7 @@
FirstTimeWizard.resize(550, 386)
FirstTimeWizard.setModal(True)
FirstTimeWizard.setWizardStyle(QtGui.QWizard.ModernStyle)
- FirstTimeWizard.setOptions(QtGui.QWizard.IndependentPages|
+ FirstTimeWizard.setOptions(QtGui.QWizard.IndependentPages |
QtGui.QWizard.NoBackButtonOnStartPage |
QtGui.QWizard.NoBackButtonOnLastPage)
self.finishButton = self.button(QtGui.QWizard.FinishButton)
@@ -81,9 +81,9 @@
self.pluginLayout.addWidget(self.imageCheckBox)
self.presentationCheckBox = QtGui.QCheckBox(self.pluginPage)
if sys.platform == "darwin":
- self.presentationCheckBox.setChecked(False)
+ self.presentationCheckBox.setChecked(False)
else:
- self.presentationCheckBox.setChecked(True)
+ self.presentationCheckBox.setChecked(True)
self.presentationCheckBox.setObjectName(u'presentationCheckBox')
self.pluginLayout.addWidget(self.presentationCheckBox)
self.mediaCheckBox = QtGui.QCheckBox(self.pluginPage)
=== modified file 'openlp/core/ui/settingsform.py'
--- openlp/core/ui/settingsform.py 2011-06-12 16:02:52 +0000
+++ openlp/core/ui/settingsform.py 2011-07-17 15:23:31 +0000
@@ -29,7 +29,7 @@
"""
import logging
-from PyQt4 import QtGui, QtCore
+from PyQt4 import QtGui
from openlp.core.lib import Receiver, build_icon, PluginStatus
from openlp.core.ui import AdvancedTab, GeneralTab, ThemesTab
=== modified file 'openlp/core/ui/shortcutlistform.py'
--- openlp/core/ui/shortcutlistform.py 2011-06-23 22:30:56 +0000
+++ openlp/core/ui/shortcutlistform.py 2011-07-17 15:23:31 +0000
@@ -247,7 +247,8 @@
alternate_label_text = action.defaultShortcuts[1].toString()
shortcuts = self._actionShortcuts(action)
# We do not want to loose pending changes, that is why we have to
- # keep the text when, this function has not been triggered by a signal.
+ # keep the text when, this function has not been triggered by a
+ # signal.
if item is None:
primary_text = self.primaryPushButton.text()
alternate_text = self.alternatePushButton.text()
@@ -280,7 +281,8 @@
"""
Restores all default shortcuts.
"""
- if self.buttonBox.buttonRole(button) != QtGui.QDialogButtonBox.ResetRole:
+ if self.buttonBox.buttonRole(button) != \
+ QtGui.QDialogButtonBox.ResetRole:
return
if QtGui.QMessageBox.question(self,
translate('OpenLP.ShortcutListDialog', 'Restore Default Shortcuts'),
=== modified file 'openlp/core/ui/slidecontroller.py'
--- openlp/core/ui/slidecontroller.py 2011-07-10 12:07:10 +0000
+++ openlp/core/ui/slidecontroller.py 2011-07-17 15:23:31 +0000
@@ -33,8 +33,8 @@
from PyQt4 import QtCore, QtGui
from PyQt4.phonon import Phonon
-from openlp.core.lib import OpenLPToolbar, Receiver, resize_image, \
- ItemCapabilities, translate, build_icon
+from openlp.core.lib import OpenLPToolbar, Receiver, ItemCapabilities, \
+ translate, build_icon
from openlp.core.lib.ui import UiStrings, shortcut_action
from openlp.core.ui import HideMode, MainDisplay, ScreenList
from openlp.core.utils.actions import ActionList, CategoryOrder
=== modified file 'openlp/core/utils/__init__.py'
--- openlp/core/utils/__init__.py 2011-07-13 13:32:19 +0000
+++ openlp/core/utils/__init__.py 2011-07-17 15:23:31 +0000
@@ -459,25 +459,6 @@
return None
return ucsfile
-def string_is_unicode(test_string):
- """
- Makes sure a string is unicode.
-
- ``test_string``
- The string to confirm is unicode.
- """
- return_string = u''
- if not test_string:
- return return_string
- if isinstance(test_string, unicode):
- return_string = test_string
- if not isinstance(test_string, unicode):
- try:
- return_string = unicode(test_string, u'utf-8')
- except UnicodeError:
- log.exception("Error encoding string to unicode")
- return return_string
-
def get_uno_command():
"""
Returns the UNO command to launch an openoffice.org instance.
@@ -510,5 +491,5 @@
__all__ = [u'AppLocation', u'get_application_version', u'check_latest_version',
u'add_actions', u'get_filesystem_encoding', u'LanguageManager',
- u'ActionList', u'get_web_page', u'file_is_unicode', u'string_is_unicode',
- u'get_uno_command', u'get_uno_instance', u'delete_file']
+ u'ActionList', u'get_web_page', u'file_is_unicode', u'get_uno_command',
+ u'get_uno_instance', u'delete_file']
=== modified file 'openlp/plugins/alerts/alertsplugin.py'
--- openlp/plugins/alerts/alertsplugin.py 2011-07-11 16:32:25 +0000
+++ openlp/plugins/alerts/alertsplugin.py 2011-07-17 15:23:31 +0000
@@ -27,7 +27,7 @@
import logging
-from PyQt4 import QtCore, QtGui
+from PyQt4 import QtCore
from openlp.core.lib import Plugin, StringContent, build_icon, translate
from openlp.core.lib.db import Manager
=== modified file 'openlp/plugins/bibles/forms/bibleimportform.py'
--- openlp/plugins/bibles/forms/bibleimportform.py 2011-06-12 16:02:52 +0000
+++ openlp/plugins/bibles/forms/bibleimportform.py 2011-07-17 15:23:31 +0000
@@ -27,7 +27,6 @@
"""
The bible import functions for OpenLP
"""
-import csv
import logging
import os
import os.path
@@ -39,7 +38,7 @@
from openlp.core.lib.db import delete_database
from openlp.core.lib.ui import UiStrings, critical_error_message_box
from openlp.core.ui.wizard import OpenLPWizard, WizardStrings
-from openlp.core.utils import AppLocation, string_is_unicode
+from openlp.core.utils import AppLocation
from openlp.plugins.bibles.lib.manager import BibleFormat
from openlp.plugins.bibles.lib.db import BiblesResourcesDB, clean_filename
=== modified file 'openlp/plugins/bibles/forms/bibleupgradeform.py'
--- openlp/plugins/bibles/forms/bibleupgradeform.py 2011-07-14 16:20:25 +0000
+++ openlp/plugins/bibles/forms/bibleupgradeform.py 2011-07-17 15:23:31 +0000
@@ -38,7 +38,7 @@
from openlp.core.lib.ui import UiStrings, critical_error_message_box
from openlp.core.ui.wizard import OpenLPWizard, WizardStrings
from openlp.core.utils import AppLocation, delete_file
-from openlp.plugins.bibles.lib.db import BibleDB, BibleMeta, OldBibleDB,\
+from openlp.plugins.bibles.lib.db import BibleDB, BibleMeta, OldBibleDB, \
BiblesResourcesDB, clean_filename
from openlp.plugins.bibles.lib.http import BSExtract, BGExtract, CWExtract
=== modified file 'openlp/plugins/bibles/lib/db.py'
--- openlp/plugins/bibles/lib/db.py 2011-06-12 16:02:52 +0000
+++ openlp/plugins/bibles/lib/db.py 2011-07-17 15:23:31 +0000
@@ -36,7 +36,7 @@
from sqlalchemy.orm import class_mapper, mapper, relation
from sqlalchemy.orm.exc import UnmappedClassError
-from openlp.core.lib import Receiver, translate, check_directory_exists
+from openlp.core.lib import Receiver, translate
from openlp.core.lib.db import BaseModel, init_db, Manager
from openlp.core.lib.ui import critical_error_message_box
from openlp.core.utils import AppLocation
=== modified file 'openlp/plugins/bibles/lib/http.py'
--- openlp/plugins/bibles/lib/http.py 2011-07-11 16:32:25 +0000
+++ openlp/plugins/bibles/lib/http.py 2011-07-17 15:23:31 +0000
@@ -29,9 +29,7 @@
websites.
"""
import logging
-import os
import re
-import sqlite3
import socket
import urllib
from HTMLParser import HTMLParseError
@@ -40,7 +38,7 @@
from openlp.core.lib import Receiver, translate
from openlp.core.lib.ui import critical_error_message_box
-from openlp.core.utils import AppLocation, get_web_page
+from openlp.core.utils import get_web_page
from openlp.plugins.bibles.lib import SearchResults
from openlp.plugins.bibles.lib.db import BibleDB, BiblesResourcesDB, \
Book
=== modified file 'openlp/plugins/bibles/lib/manager.py'
--- openlp/plugins/bibles/lib/manager.py 2011-06-12 16:02:52 +0000
+++ openlp/plugins/bibles/lib/manager.py 2011-07-17 15:23:31 +0000
@@ -34,7 +34,7 @@
from openlp.core.lib.ui import critical_error_message_box
from openlp.core.utils import AppLocation, delete_file
from openlp.plugins.bibles.lib import parse_reference
-from openlp.plugins.bibles.lib.db import BibleDB, BibleMeta, OldBibleDB
+from openlp.plugins.bibles.lib.db import BibleDB, BibleMeta
from csvbible import CSVBible
from http import HTTPBible
from opensong import OpenSongBible
=== modified file 'openlp/plugins/remotes/lib/httpserver.py'
--- openlp/plugins/remotes/lib/httpserver.py 2011-06-12 16:02:52 +0000
+++ openlp/plugins/remotes/lib/httpserver.py 2011-07-17 15:23:31 +0000
@@ -357,7 +357,8 @@
if ext == u'.html':
mimetype = u'text/html'
variables = self.template_vars
- html = Template(filename=path, input_encoding=u'utf-8', output_encoding=u'utf-8').render(**variables)
+ html = Template(filename=path, input_encoding=u'utf-8',
+ output_encoding=u'utf-8').render(**variables)
elif ext == u'.css':
mimetype = u'text/css'
elif ext == u'.js':
=== modified file 'openlp/plugins/songs/lib/db.py'
--- openlp/plugins/songs/lib/db.py 2011-06-12 16:02:52 +0000
+++ openlp/plugins/songs/lib/db.py 2011-07-17 15:23:31 +0000
@@ -29,7 +29,7 @@
the Songs plugin
"""
-from sqlalchemy import Column, ForeignKey, Index, Table, types
+from sqlalchemy import Column, ForeignKey, Table, types
from sqlalchemy.orm import mapper, relation
from openlp.core.lib.db import BaseModel, init_db
=== modified file 'openlp/plugins/songs/lib/easislidesimport.py'
--- openlp/plugins/songs/lib/easislidesimport.py 2011-06-20 22:11:05 +0000
+++ openlp/plugins/songs/lib/easislidesimport.py 2011-07-17 15:23:31 +0000
@@ -26,13 +26,10 @@
###############################################################################
import logging
-import os
import re
from lxml import etree, objectify
-from openlp.core.lib import translate
-from openlp.core.ui.wizard import WizardStrings
from openlp.plugins.songs.lib import VerseType
from openlp.plugins.songs.lib.songimport import SongImport
=== modified file 'openlp/plugins/songs/lib/ewimport.py'
--- openlp/plugins/songs/lib/ewimport.py 2011-07-05 12:00:34 +0000
+++ openlp/plugins/songs/lib/ewimport.py 2011-07-17 15:23:31 +0000
@@ -34,7 +34,6 @@
import re
from openlp.core.lib import translate
-from openlp.core.ui.wizard import WizardStrings
from openlp.plugins.songs.lib import VerseType
from openlp.plugins.songs.lib import retrieve_windows_encoding
from songimport import SongImport
=== modified file 'openlp/plugins/songs/lib/opensongimport.py'
--- openlp/plugins/songs/lib/opensongimport.py 2011-07-15 18:18:11 +0000
+++ openlp/plugins/songs/lib/opensongimport.py 2011-07-17 15:23:31 +0000
@@ -26,7 +26,6 @@
###############################################################################
import logging
-import os
import re
from lxml import objectify
=== modified file 'openlp/plugins/songs/lib/songbeamerimport.py'
--- openlp/plugins/songs/lib/songbeamerimport.py 2011-06-12 16:02:52 +0000
+++ openlp/plugins/songs/lib/songbeamerimport.py 2011-07-17 15:23:31 +0000
@@ -36,7 +36,6 @@
from openlp.plugins.songs.lib import VerseType
from openlp.plugins.songs.lib.songimport import SongImport
-from openlp.plugins.songs.lib.ui import SongStrings
log = logging.getLogger(__name__)
=== modified file 'openlp/plugins/songs/lib/songimport.py'
--- openlp/plugins/songs/lib/songimport.py 2011-06-12 16:02:52 +0000
+++ openlp/plugins/songs/lib/songimport.py 2011-07-17 15:23:31 +0000
@@ -29,9 +29,8 @@
from PyQt4 import QtCore
-from openlp.core.lib import Receiver, translate, check_directory_exists
+from openlp.core.lib import Receiver, translate
from openlp.core.ui.wizard import WizardStrings
-from openlp.core.utils import AppLocation
from openlp.plugins.songs.lib import clean_song, VerseType
from openlp.plugins.songs.lib.db import Song, Author, Topic, Book, MediaFile
from openlp.plugins.songs.lib.ui import SongStrings
=== modified file 'openlp/plugins/songs/lib/wowimport.py'
--- openlp/plugins/songs/lib/wowimport.py 2011-06-12 16:02:52 +0000
+++ openlp/plugins/songs/lib/wowimport.py 2011-07-17 15:23:31 +0000
@@ -31,7 +31,6 @@
import os
import logging
-from openlp.core.ui.wizard import WizardStrings
from openlp.plugins.songs.lib.songimport import SongImport
BLOCK_TYPES = (u'V', u'C', u'B')
=== modified file 'openlp/plugins/songusage/songusageplugin.py'
--- openlp/plugins/songusage/songusageplugin.py 2011-07-08 15:07:53 +0000
+++ openlp/plugins/songusage/songusageplugin.py 2011-07-17 15:23:31 +0000
@@ -33,7 +33,7 @@
from openlp.core.lib import Plugin, StringContent, Receiver, build_icon, \
translate
from openlp.core.lib.db import Manager
-from openlp.core.lib.ui import base_action, shortcut_action, UiStrings
+from openlp.core.lib.ui import base_action, shortcut_action
from openlp.core.utils.actions import ActionList
from openlp.plugins.songusage.forms import SongUsageDetailForm, \
SongUsageDeleteForm
_______________________________________________
Mailing list: https://launchpad.net/~openlp-core
Post to : openlp-core@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openlp-core
More help : https://help.launchpad.net/ListHelp
