openlp-core team mailing list archive
-
openlp-core team
-
Mailing list archive
-
Message #19162
[Merge] lp:~googol/openlp/clean-up into lp:openlp
Andreas Preikschat has proposed merging lp:~googol/openlp/clean-up into lp:openlp.
Requested reviews:
Raoul Snyman (raoul-snyman)
For more details, see:
https://code.launchpad.net/~googol/openlp/clean-up/+merge/146566
Hello
- removed not needed imports; removed not needed script
- used += instead
- fixed short lines
- converted print statements
--
https://code.launchpad.net/~googol/openlp/clean-up/+merge/146566
Your team OpenLP Core is subscribed to branch lp:openlp.
=== modified file 'openlp/core/__init__.py'
--- openlp/core/__init__.py 2013-02-03 19:23:12 +0000
+++ openlp/core/__init__.py 2013-02-05 06:57:22 +0000
@@ -242,7 +242,7 @@
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):
=== modified file 'openlp/core/lib/db.py'
--- openlp/core/lib/db.py 2013-02-02 20:54:34 +0000
+++ openlp/core/lib/db.py 2013-02-05 06:57:22 +0000
@@ -61,8 +61,7 @@
"""
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
=== modified file 'openlp/core/lib/screen.py'
--- openlp/core/lib/screen.py 2013-02-01 19:58:18 +0000
+++ openlp/core/lib/screen.py 2013-02-05 06:57:22 +0000
@@ -139,8 +139,7 @@
"""
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 @@
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):
=== modified file 'openlp/core/lib/ui.py'
--- openlp/core/lib/ui.py 2013-01-11 19:36:28 +0000
+++ openlp/core/lib/ui.py 2013-02-05 06:57:22 +0000
@@ -67,7 +67,7 @@
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 @@
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
=== modified file 'openlp/core/ui/exceptionform.py'
--- openlp/core/ui/exceptionform.py 2013-02-01 19:58:18 +0000
+++ openlp/core/ui/exceptionform.py 2013-02-05 06:57:22 +0000
@@ -141,9 +141,9 @@
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):
=== modified file 'openlp/core/ui/firsttimeform.py'
--- openlp/core/ui/firsttimeform.py 2013-02-03 19:23:12 +0000
+++ openlp/core/ui/firsttimeform.py 2013-02-05 06:57:22 +0000
@@ -369,7 +369,7 @@
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)
=== modified file 'openlp/core/ui/mainwindow.py'
--- openlp/core/ui/mainwindow.py 2013-02-03 19:23:12 +0000
+++ openlp/core/ui/mainwindow.py 2013-02-05 06:57:22 +0000
@@ -903,7 +903,7 @@
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()
=== modified file 'openlp/core/ui/splashscreen.py'
--- openlp/core/ui/splashscreen.py 2013-02-03 17:42:31 +0000
+++ openlp/core/ui/splashscreen.py 2013-02-05 06:57:22 +0000
@@ -29,7 +29,6 @@
"""
The splash screen
"""
-from openlp.core.lib import Receiver
from PyQt4 import QtCore, QtGui
=== modified file 'openlp/plugins/alerts/alertsplugin.py'
--- openlp/plugins/alerts/alertsplugin.py 2013-01-23 21:05:25 +0000
+++ openlp/plugins/alerts/alertsplugin.py 2013-02-05 06:57:22 +0000
@@ -29,7 +29,7 @@
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.db import Manager
=== modified file 'openlp/plugins/alerts/lib/alertstab.py'
--- openlp/plugins/alerts/lib/alertstab.py 2013-01-11 00:19:11 +0000
+++ openlp/plugins/alerts/lib/alertstab.py 2013-02-05 06:57:22 +0000
@@ -30,7 +30,6 @@
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.ui import create_valign_selection_widgets
class AlertsTab(SettingsTab):
=== modified file 'openlp/plugins/bibles/bibleplugin.py'
--- openlp/plugins/bibles/bibleplugin.py 2013-02-03 14:40:48 +0000
+++ openlp/plugins/bibles/bibleplugin.py 2013-02-05 06:57:22 +0000
@@ -31,7 +31,7 @@
from PyQt4 import QtGui
-from openlp.core.lib import Plugin, StringContent, build_icon, translate, Settings
+from openlp.core.lib import Plugin, StringContent, build_icon, translate
from openlp.core.lib.ui import create_action, UiStrings
from openlp.core.utils.actions import ActionList
from openlp.plugins.bibles.lib import BibleManager, BiblesTab, BibleMediaItem, LayoutStyle, DisplayStyle, \
=== modified file 'openlp/plugins/bibles/lib/csvbible.py'
--- openlp/plugins/bibles/lib/csvbible.py 2013-02-03 19:23:12 +0000
+++ openlp/plugins/bibles/lib/csvbible.py 2013-02-05 06:57:22 +0000
@@ -62,7 +62,7 @@
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__)
=== modified file 'openlp/plugins/bibles/lib/http.py'
--- openlp/plugins/bibles/lib/http.py 2013-02-03 19:23:12 +0000
+++ openlp/plugins/bibles/lib/http.py 2013-02-05 06:57:22 +0000
@@ -38,7 +38,7 @@
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 @@
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 @@
``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 @@
"""
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 @@
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 @@
``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 @@
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 @@
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 @@
``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 @@
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 @@
self.wizard.incrementProgressBar(translate(
'BiblesPlugin.HTTPBible', 'Importing %s...',
'Importing <book name>...') % 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 @@
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()
=== modified file 'openlp/plugins/bibles/lib/openlp1.py'
--- openlp/plugins/bibles/lib/openlp1.py 2013-02-03 19:23:12 +0000
+++ openlp/plugins/bibles/lib/openlp1.py 2013-02-05 06:57:22 +0000
@@ -31,7 +31,6 @@
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
=== modified file 'openlp/plugins/bibles/lib/versereferencelist.py'
--- openlp/plugins/bibles/lib/versereferencelist.py 2013-01-01 16:33:41 +0000
+++ openlp/plugins/bibles/lib/versereferencelist.py 2013-02-05 06:57:22 +0000
@@ -72,12 +72,12 @@
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 @@
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']
=== modified file 'openlp/plugins/custom/forms/editcustomslidedialog.py'
--- openlp/plugins/custom/forms/editcustomslidedialog.py 2013-01-27 20:36:18 +0000
+++ openlp/plugins/custom/forms/editcustomslidedialog.py 2013-02-05 06:57:22 +0000
@@ -29,7 +29,7 @@
from PyQt4 import QtGui
-from openlp.core.lib import translate, SpellTextEdit, build_icon, UiStrings
+from openlp.core.lib import translate, SpellTextEdit, UiStrings
from openlp.core.lib.ui import create_button, create_button_box
class Ui_CustomSlideEditDialog(object):
=== modified file 'openlp/plugins/media/lib/mediaitem.py'
--- openlp/plugins/media/lib/mediaitem.py 2013-01-25 20:50:18 +0000
+++ openlp/plugins/media/lib/mediaitem.py 2013-02-05 06:57:22 +0000
@@ -32,7 +32,7 @@
from PyQt4 import QtCore, QtGui
-from openlp.core.lib import MediaManagerItem, build_icon, ItemCapabilities, SettingsManager, translate, \
+from openlp.core.lib import MediaManagerItem, build_icon, ItemCapabilities, translate, \
check_item_selected, Receiver, MediaType, ServiceItem, ServiceItemContext, Settings, UiStrings, \
check_directory_exists
from openlp.core.lib.ui import critical_error_message_box, create_horizontal_adjusting_combo_box
=== modified file 'openlp/plugins/media/lib/mediatab.py'
--- openlp/plugins/media/lib/mediatab.py 2013-01-27 07:36:04 +0000
+++ openlp/plugins/media/lib/mediatab.py 2013-02-05 06:57:22 +0000
@@ -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
class MediaQCheckBox(QtGui.QCheckBox):
"""
=== modified file 'openlp/plugins/presentations/lib/impresscontroller.py'
--- openlp/plugins/presentations/lib/impresscontroller.py 2013-01-05 22:17:30 +0000
+++ openlp/plugins/presentations/lib/impresscontroller.py 2013-02-05 06:57:22 +0000
@@ -189,7 +189,7 @@
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 @@
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()
=== modified file 'openlp/plugins/presentations/lib/mediaitem.py'
--- openlp/plugins/presentations/lib/mediaitem.py 2013-02-03 19:23:12 +0000
+++ openlp/plugins/presentations/lib/mediaitem.py 2013-02-05 06:57:22 +0000
@@ -32,7 +32,7 @@
from PyQt4 import QtCore, QtGui
-from openlp.core.lib import MediaManagerItem, build_icon, SettingsManager, translate, check_item_selected, Receiver, \
+from openlp.core.lib import MediaManagerItem, build_icon, translate, check_item_selected, Receiver, \
ItemCapabilities, create_thumb, validate_thumb, ServiceItemContext, Settings, UiStrings
from openlp.core.lib.ui import critical_error_message_box, create_horizontal_adjusting_combo_box
from openlp.core.utils import locale_compare
@@ -269,7 +269,7 @@
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
=== modified file 'openlp/plugins/presentations/lib/messagelistener.py'
--- openlp/plugins/presentations/lib/messagelistener.py 2013-01-18 23:31:02 +0000
+++ openlp/plugins/presentations/lib/messagelistener.py 2013-02-05 06:57:22 +0000
@@ -177,7 +177,7 @@
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 @@
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():
=== modified file 'openlp/plugins/presentations/lib/pptviewlib/ppttest.py'
--- openlp/plugins/presentations/lib/pptviewlib/ppttest.py 2012-12-29 20:56:56 +0000
+++ openlp/plugins/presentations/lib/pptviewlib/ppttest.py 2013-02-05 06:57:22 +0000
@@ -71,35 +71,35 @@
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)
=== modified file 'openlp/plugins/presentations/lib/presentationtab.py'
--- openlp/plugins/presentations/lib/presentationtab.py 2013-01-27 07:36:04 +0000
+++ openlp/plugins/presentations/lib/presentationtab.py 2013-02-05 06:57:22 +0000
@@ -27,7 +27,7 @@
# 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
=== modified file 'openlp/plugins/remotes/lib/httpserver.py'
--- openlp/plugins/remotes/lib/httpserver.py 2013-01-23 19:53:02 +0000
+++ openlp/plugins/remotes/lib/httpserver.py 2013-02-05 06:57:22 +0000
@@ -138,7 +138,9 @@
'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
=== modified file 'openlp/plugins/remotes/lib/remotetab.py'
--- openlp/plugins/remotes/lib/remotetab.py 2013-01-21 23:42:35 +0000
+++ openlp/plugins/remotes/lib/remotetab.py 2013-02-05 06:57:22 +0000
@@ -133,7 +133,7 @@
ipAddress = self.addressEdit.text()
url = u'http://%s:%s/' % (ipAddress, self.portSpinBox.value())
self.remoteUrl.setText(u'<a href="%s">%s</a>' % (url, url))
- url = url + u'stage'
+ url += u'stage'
self.stageUrl.setText(u'<a href="%s">%s</a>' % (url, url))
def load(self):
=== modified file 'openlp/plugins/songs/forms/editsongform.py'
--- openlp/plugins/songs/forms/editsongform.py 2013-01-27 20:36:18 +0000
+++ openlp/plugins/songs/forms/editsongform.py 2013-02-05 06:57:22 +0000
@@ -40,7 +40,7 @@
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.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
=== modified file 'openlp/plugins/songs/forms/editverseform.py'
--- openlp/plugins/songs/forms/editverseform.py 2013-01-05 22:17:30 +0000
+++ openlp/plugins/songs/forms/editverseform.py 2013-02-05 06:57:22 +0000
@@ -32,8 +32,7 @@
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
=== modified file 'openlp/plugins/songs/lib/easyslidesimport.py'
--- openlp/plugins/songs/lib/easyslidesimport.py 2013-01-06 17:25:49 +0000
+++ openlp/plugins/songs/lib/easyslidesimport.py 2013-02-05 06:57:22 +0000
@@ -162,7 +162,7 @@
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 @@
# 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'
=== modified file 'openlp/plugins/songs/lib/songshowplusimport.py'
--- openlp/plugins/songs/lib/songshowplusimport.py 2013-01-06 17:25:49 +0000
+++ openlp/plugins/songs/lib/songshowplusimport.py 2013-02-05 06:57:22 +0000
@@ -203,7 +203,7 @@
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]
=== modified file 'openlp/plugins/songs/lib/sundayplusimport.py'
--- openlp/plugins/songs/lib/sundayplusimport.py 2013-01-06 17:25:49 +0000
+++ openlp/plugins/songs/lib/sundayplusimport.py 2013-02-05 06:57:22 +0000
@@ -121,7 +121,7 @@
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':
=== modified file 'openlp/plugins/songs/lib/test/test_import_file.py'
--- openlp/plugins/songs/lib/test/test_import_file.py 2012-12-29 20:56:56 +0000
+++ openlp/plugins/songs/lib/test/test_import_file.py 2013-02-05 06:57:22 +0000
@@ -36,7 +36,7 @@
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)
=== modified file 'openlp/plugins/songs/lib/test/test_importing_lots.py'
--- openlp/plugins/songs/lib/test/test_importing_lots.py 2012-12-29 20:56:56 +0000
+++ openlp/plugins/songs/lib/test/test_importing_lots.py 2013-02-05 06:57:22 +0000
@@ -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!
=== removed file 'scripts/openlp-remoteclient.py'
--- scripts/openlp-remoteclient.py 2012-12-29 20:56:56 +0000
+++ scripts/openlp-remoteclient.py 1970-01-01 00:00:00 +0000
@@ -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()
=== modified file 'scripts/translation_utils.py'
--- scripts/translation_utils.py 2012-12-29 20:56:56 +0000
+++ scripts/translation_utils.py 2013-02-05 06:57:22 +0000
@@ -53,8 +53,6 @@
"""
import os
import urllib2
-import re
-from shutil import copy
from getpass import getpass
import base64
import json
@@ -62,7 +60,6 @@
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 @@
"""
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 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 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 @@
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()
=== modified file 'tests/interfaces/openlp_core_ui/test_starttimedialog.py'
--- tests/interfaces/openlp_core_ui/test_starttimedialog.py 2013-01-31 19:41:45 +0000
+++ tests/interfaces/openlp_core_ui/test_starttimedialog.py 2013-02-05 06:57:22 +0000
@@ -1,7 +1,6 @@
"""
Package to test the openlp.core.ui package.
"""
-import sys
from unittest import TestCase
from mock import MagicMock, patch
Follow ups
