forked from openlp/openlp
- removed not needed imports
- fixed wrong list comprehensions - other minor fixes bzr-revno: 1768
This commit is contained in:
commit
ef3134d3d9
@ -28,7 +28,6 @@
|
|||||||
import logging
|
import logging
|
||||||
import chardet
|
import chardet
|
||||||
import os
|
import os
|
||||||
import re
|
|
||||||
import sqlite3
|
import sqlite3
|
||||||
|
|
||||||
from PyQt4 import QtCore
|
from PyQt4 import QtCore
|
||||||
|
@ -82,13 +82,16 @@ class BGExtract(object):
|
|||||||
Receiver.send_message(u'openlp_process_events')
|
Receiver.send_message(u'openlp_process_events')
|
||||||
footnotes = soup.findAll(u'sup', u'footnote')
|
footnotes = soup.findAll(u'sup', u'footnote')
|
||||||
if footnotes:
|
if footnotes:
|
||||||
[footnote.extract() for footnote in footnotes]
|
for footnote in footnotes:
|
||||||
|
footnote.extract()
|
||||||
crossrefs = soup.findAll(u'sup', u'xref')
|
crossrefs = soup.findAll(u'sup', u'xref')
|
||||||
if crossrefs:
|
if crossrefs:
|
||||||
[crossref.extract() for crossref in crossrefs]
|
for crossref in crossrefs:
|
||||||
|
crossref.extract()
|
||||||
headings = soup.findAll(u'h5')
|
headings = soup.findAll(u'h5')
|
||||||
if headings:
|
if headings:
|
||||||
[heading.extract() for heading in headings]
|
for heading in headings:
|
||||||
|
heading.extract()
|
||||||
cleanup = [(re.compile('\s+'), lambda match: ' ')]
|
cleanup = [(re.compile('\s+'), lambda match: ' ')]
|
||||||
verses = BeautifulSoup(str(soup), markupMassage=cleanup)
|
verses = BeautifulSoup(str(soup), markupMassage=cleanup)
|
||||||
verse_list = {}
|
verse_list = {}
|
||||||
|
@ -28,7 +28,6 @@
|
|||||||
from PyQt4 import QtCore, QtGui
|
from PyQt4 import QtCore, QtGui
|
||||||
|
|
||||||
from openlp.core.lib import SettingsTab, translate, Receiver
|
from openlp.core.lib import SettingsTab, translate, Receiver
|
||||||
from openlp.core.lib.ui import UiStrings, create_valign_combo
|
|
||||||
|
|
||||||
class ImageTab(SettingsTab):
|
class ImageTab(SettingsTab):
|
||||||
"""
|
"""
|
||||||
|
@ -32,7 +32,7 @@ import shutil
|
|||||||
from PyQt4 import QtCore
|
from PyQt4 import QtCore
|
||||||
|
|
||||||
from openlp.core.lib import Receiver, check_directory_exists, create_thumb, \
|
from openlp.core.lib import Receiver, check_directory_exists, create_thumb, \
|
||||||
resize_image, validate_thumb
|
validate_thumb
|
||||||
from openlp.core.utils import AppLocation
|
from openlp.core.utils import AppLocation
|
||||||
|
|
||||||
log = logging.getLogger(__name__)
|
log = logging.getLogger(__name__)
|
||||||
|
@ -87,7 +87,7 @@ class PresentationPlugin(Plugin):
|
|||||||
to close down their applications and release resources.
|
to close down their applications and release resources.
|
||||||
"""
|
"""
|
||||||
log.info(u'Plugin Finalise')
|
log.info(u'Plugin Finalise')
|
||||||
#Ask each controller to tidy up
|
# Ask each controller to tidy up.
|
||||||
for key in self.controllers:
|
for key in self.controllers:
|
||||||
controller = self.controllers[key]
|
controller = self.controllers[key]
|
||||||
if controller.enabled():
|
if controller.enabled():
|
||||||
|
@ -333,5 +333,6 @@ class CCLIFileImport(SongImport):
|
|||||||
if len(author_list) < 2:
|
if len(author_list) < 2:
|
||||||
author_list = song_author.split(u'|')
|
author_list = song_author.split(u'|')
|
||||||
# Clean spaces before and after author names.
|
# Clean spaces before and after author names.
|
||||||
[self.addAuthor(author_name.strip()) for author_name in author_list]
|
for author_name in author_list:
|
||||||
|
self.addAuthor(author_name.strip())
|
||||||
return self.finish()
|
return self.finish()
|
||||||
|
@ -397,7 +397,8 @@ class SongMediaItem(MediaManagerItem):
|
|||||||
try:
|
try:
|
||||||
os.remove(media_file.file_name)
|
os.remove(media_file.file_name)
|
||||||
except:
|
except:
|
||||||
log.exception('Could not remove file: %s', audio)
|
log.exception('Could not remove file: %s',
|
||||||
|
media_file.file_name)
|
||||||
try:
|
try:
|
||||||
save_path = os.path.join(AppLocation.get_section_data_path(
|
save_path = os.path.join(AppLocation.get_section_data_path(
|
||||||
self.plugin.name), 'audio', str(item_id))
|
self.plugin.name), 'audio', str(item_id))
|
||||||
|
@ -30,7 +30,6 @@ songs from the database to the OpenLyrics format.
|
|||||||
"""
|
"""
|
||||||
import logging
|
import logging
|
||||||
import os
|
import os
|
||||||
import re
|
|
||||||
|
|
||||||
from lxml import etree
|
from lxml import etree
|
||||||
|
|
||||||
|
@ -29,7 +29,7 @@ The :mod:`upgrade` module provides a way for the database and schema that is the
|
|||||||
backend for the Songs plugin
|
backend for the Songs plugin
|
||||||
"""
|
"""
|
||||||
|
|
||||||
from sqlalchemy import Column, ForeignKey, Table, types
|
from sqlalchemy import Column, Table, types
|
||||||
from sqlalchemy.sql.expression import func
|
from sqlalchemy.sql.expression import func
|
||||||
from migrate import changeset
|
from migrate import changeset
|
||||||
from migrate.changeset.constraint import ForeignKeyConstraint
|
from migrate.changeset.constraint import ForeignKeyConstraint
|
||||||
|
@ -28,7 +28,6 @@
|
|||||||
from PyQt4 import QtCore, QtGui
|
from PyQt4 import QtCore, QtGui
|
||||||
|
|
||||||
from openlp.core.lib import translate
|
from openlp.core.lib import translate
|
||||||
from openlp.core.lib.ui import create_accept_reject_button_box
|
|
||||||
|
|
||||||
class Ui_SongUsageDeleteDialog(object):
|
class Ui_SongUsageDeleteDialog(object):
|
||||||
def setupUi(self, songUsageDeleteDialog):
|
def setupUi(self, songUsageDeleteDialog):
|
||||||
|
Loading…
Reference in New Issue
Block a user