From b98e36aff28298b3c28c06e7ecc07adc9efd5d32 Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Wed, 13 Jul 2011 15:32:19 +0200 Subject: [PATCH 1/2] regex clean ups --- openlp/core/utils/__init__.py | 7 +++---- openlp/plugins/bibles/forms/bibleupgradeform.py | 6 ++---- openlp/plugins/songs/forms/editverseform.py | 7 ++++--- openlp/plugins/songs/lib/xml.py | 5 +++-- 4 files changed, 12 insertions(+), 13 deletions(-) diff --git a/openlp/core/utils/__init__.py b/openlp/core/utils/__init__.py index 317083799..081870587 100644 --- a/openlp/core/utils/__init__.py +++ b/openlp/core/utils/__init__.py @@ -53,6 +53,7 @@ APPLICATION_VERSION = {} IMAGES_FILTER = None UNO_CONNECTION_TYPE = u'pipe' #UNO_CONNECTION_TYPE = u'socket' +VERSION_SPLITTER = re.compile(r'([0-9]+).([0-9]+).([0-9]+)(?:-bzr([0-9]+))?') class VersionThread(QtCore.QThread): """ @@ -61,8 +62,6 @@ class VersionThread(QtCore.QThread): """ def __init__(self, parent): QtCore.QThread.__init__(self, parent) - self.version_splitter = re.compile( - r'([0-9]+).([0-9]+).([0-9]+)(?:-bzr([0-9]+))?') def run(self): """ @@ -73,7 +72,7 @@ class VersionThread(QtCore.QThread): version = check_latest_version(app_version) remote_version = {} local_version = {} - match = self.version_splitter.match(version) + match = VERSION_SPLITTER.match(version) if match: remote_version[u'major'] = int(match.group(1)) remote_version[u'minor'] = int(match.group(2)) @@ -82,7 +81,7 @@ class VersionThread(QtCore.QThread): remote_version[u'revision'] = int(match.group(4)) else: return - match = self.version_splitter.match(app_version[u'full']) + match = VERSION_SPLITTER.match(app_version[u'full']) if match: local_version[u'major'] = int(match.group(1)) local_version[u'minor'] = int(match.group(2)) diff --git a/openlp/plugins/bibles/forms/bibleupgradeform.py b/openlp/plugins/bibles/forms/bibleupgradeform.py index 14936a340..aeff6f3cc 100644 --- a/openlp/plugins/bibles/forms/bibleupgradeform.py +++ b/openlp/plugins/bibles/forms/bibleupgradeform.py @@ -27,8 +27,7 @@ The bible import functions for OpenLP """ import logging -import os.path -import re +import os import shutil from PyQt4 import QtCore, QtGui @@ -70,8 +69,7 @@ class BibleUpgradeForm(OpenLPWizard): self.mediaItem = bibleplugin.mediaItem self.suffix = u'.sqlite' self.settingsSection = u'bibles' - self.path = AppLocation.get_section_data_path( - self.settingsSection) + self.path = AppLocation.get_section_data_path(self.settingsSection) self.files = self.manager.old_bible_databases self.success = {} self.newbibles = {} diff --git a/openlp/plugins/songs/forms/editverseform.py b/openlp/plugins/songs/forms/editverseform.py index 79b2b295a..1845bc0e3 100644 --- a/openlp/plugins/songs/forms/editverseform.py +++ b/openlp/plugins/songs/forms/editverseform.py @@ -37,6 +37,8 @@ from editversedialog import Ui_EditVerseDialog log = logging.getLogger(__name__) +VERSE_REGEX = re.compile(r'---\[(.+):\D*(\d*)\D*.*\]---') + class EditVerseForm(QtGui.QDialog, Ui_EditVerseDialog): """ This is the form that is used to edit the verses of the song. @@ -60,7 +62,6 @@ class EditVerseForm(QtGui.QDialog, Ui_EditVerseDialog): QtCore.QObject.connect(self.verseTypeComboBox, QtCore.SIGNAL(u'currentIndexChanged(int)'), self.onVerseTypeComboBoxChanged) - self.verse_regex = re.compile(r'---\[(.+):\D*(\d*)\D*.*\]---') def contextMenu(self, point): item = self.serviceManagerList.itemAt(point) @@ -105,7 +106,7 @@ class EditVerseForm(QtGui.QDialog, Ui_EditVerseDialog): if position == -1: return text = text[:position + 4] - match = self.verse_regex.match(text) + match = VERSE_REGEX.match(text) if match: verse_tag = match.group(1) try: @@ -136,7 +137,7 @@ class EditVerseForm(QtGui.QDialog, Ui_EditVerseDialog): if position == -1: return text = text[:position + 4] - match = self.verse_regex.match(text) + match = VERSE_REGEX.match(text) if match: verse_type = match.group(1) verse_type_index = VerseType.from_loose_input(verse_type) diff --git a/openlp/plugins/songs/lib/xml.py b/openlp/plugins/songs/lib/xml.py index c5bf85ad8..3635fd7e7 100644 --- a/openlp/plugins/songs/lib/xml.py +++ b/openlp/plugins/songs/lib/xml.py @@ -73,6 +73,8 @@ from openlp.core.utils import get_application_version log = logging.getLogger(__name__) +CHORD_REGEX = re.compile(u'') + class SongXML(object): """ This class builds and parses the XML used to describe songs. @@ -234,7 +236,6 @@ class OpenLyrics(object): IMPLEMENTED_VERSION = u'0.7' def __init__(self, manager): self.manager = manager - self.chord_regex = re.compile(u'') def song_to_xml(self, song): """ @@ -319,7 +320,7 @@ class OpenLyrics(object): if xml[:5] == u' Date: Wed, 13 Jul 2011 15:41:32 +0200 Subject: [PATCH 2/2] use map instead of list comprehension; blank lines --- scripts/check_dependencies.py | 30 +++++++++--------------------- 1 file changed, 9 insertions(+), 21 deletions(-) diff --git a/scripts/check_dependencies.py b/scripts/check_dependencies.py index 4abd1504d..bf9e97d88 100755 --- a/scripts/check_dependencies.py +++ b/scripts/check_dependencies.py @@ -74,44 +74,38 @@ OPTIONAL_MODULES = [ ('sqlite', ' (SQLite 2 support)'), ('MySQLdb', ' (MySQL support)'), ('psycopg2', ' (PostgreSQL support)'), - ] +] w = sys.stdout.write - def check_vers(version, required, text): if type(version) is str: version = version.split('.') - version = [int(x) for x in version] + version = map(int, version) if type(required) is str: required = required.split('.') - required = [int(x) for x in required] - w(' %s >= %s ... ' % (text, '.'.join([str(x) for x in required]))) + required = map(int, required) + w(' %s >= %s ... ' % (text, '.'.join(map(str, required)))) if version >= required: - w('.'.join([str(x) for x in version]) + os.linesep) + w('.'.join(map(str, version)) + os.linesep) return True else: w('FAIL' + os.linesep) return False - def print_vers_fail(required, text): print(' %s >= %s ... FAIL' % (text, required)) - def verify_python(): if not check_vers(list(sys.version_info), VERS['Python'], text='Python'): exit(1) - def verify_versions(): print('Verifying version of modules...') try: from PyQt4 import QtCore - check_vers(QtCore.PYQT_VERSION_STR, VERS['PyQt4'], - 'PyQt4') - check_vers(QtCore.qVersion(), VERS['Qt4'], - 'Qt4') + check_vers(QtCore.PYQT_VERSION_STR, VERS['PyQt4'], 'PyQt4') + check_vers(QtCore.qVersion(), VERS['Qt4'], 'Qt4') except ImportError: print_vers_fail(VERS['PyQt4'], 'PyQt4') print_vers_fail(VERS['Qt4'], 'Qt4') @@ -126,7 +120,6 @@ def verify_versions(): except ImportError: print_vers_fail(VERS['enchant'], 'enchant') - def check_module(mod, text='', indent=' '): space = (30 - len(mod) - len(text)) * ' ' w(indent + '%s%s... ' % (mod, text) + space) @@ -137,7 +130,6 @@ def check_module(mod, text='', indent=' '): w('FAIL') w(os.linesep) - def verify_pyenchant(): w('Enchant (spell checker)... ') try: @@ -150,14 +142,13 @@ def verify_pyenchant(): except ImportError: w('FAIL' + os.linesep) - def verify_pyqt(): w('Qt4 image formats... ') try: from PyQt4 import QtGui - read_f = ', '.join([unicode(format).lower() \ + read_f = ', '.join([unicode(format).lower() for format in QtGui.QImageReader.supportedImageFormats()]) - write_f= ', '.join([unicode(format).lower() \ + write_f = ', '.join([unicode(format).lower() for format in QtGui.QImageWriter.supportedImageFormats()]) w(os.linesep) print(' read: %s' % read_f) @@ -165,9 +156,7 @@ def verify_pyqt(): except ImportError: w('FAIL' + os.linesep) - def main(): - verify_python() print('Checking for modules...') @@ -187,6 +176,5 @@ def main(): verify_pyqt() verify_pyenchant() - if __name__ == u'__main__': main()