~raoul-snyman/openlp/pep440

« back to all changes in this revision

Viewing changes to scripts/lp-merge.py

Committer: Tomas Groth
Date: 2018-07-07 06:45:39 UTC
mfrom: (2821.1.7 pycodestyle)
Revision ID: tomasgroth@yahoo.dk-20180707064539-5q0enwn43pbjou3v

Fix pep8 and pylint errors detected by new version.

files modified:
openlp/core/api/endpoint/pluginhelpers.py

openlp/core/api/http/wsgiapp.py

openlp/core/api/tab.py

openlp/core/lib/__init__.py

openlp/core/lib/htmlbuilder.py

openlp/core/projectors/pjlink.py

openlp/core/ui/media/__init__.py

openlp/core/ui/slidecontroller.py

openlp/plugins/bibles/forms/editbibleform.py

openlp/plugins/bibles/lib/__init__.py

openlp/plugins/bibles/lib/mediaitem.py

openlp/plugins/media/forms/mediaclipselectorform.py

openlp/plugins/songs/forms/editsongform.py

openlp/plugins/songs/lib/__init__.py

openlp/plugins/songs/lib/importers/dreambeam.py

openlp/plugins/songs/lib/importers/easyslides.py

openlp/plugins/songs/lib/importers/foilpresenter.py

openlp/plugins/songs/lib/importers/lyrix.py

openlp/plugins/songs/lib/importers/opensong.py

openlp/plugins/songs/lib/importers/opspro.py

openlp/plugins/songs/lib/importers/powersong.py

openlp/plugins/songs/lib/importers/presentationmanager.py

openlp/plugins/songs/lib/importers/songsoffellowship.py

openlp/plugins/songs/lib/importers/worshipassistant.py

scripts/lp-merge.py

setup.cfg

tests/functional/openlp_core/api/test_tab.py

tests/functional/openlp_core/common/test_init.py

tests/functional/openlp_core/lib/test_htmlbuilder.py

tests/interfaces/openlp_core/ui/test_filerenamedialog.py

tests/utils/test_pylint.py

Show diffs side-by-side

added added

removed removed

scripts/lp-merge.py

124

script_tag = soup.find('script', attrs={"id": "codereview-script"})

125

content = script_tag.contents[0]

126

start_pos = content.find('source_revid') + 16

127

pattern = re.compile('.*\w-\d\d\d\d\d+')

127

pattern = re.compile(r'.*\w-\d\d\d\d\d+')

128

match = pattern.match(content[start_pos:])

129

merge_info['author_email'] = match.group()[:-15]

130

# Launchpad doesn't supply the author's true name, so we'll just grab whatever they use for display on LP

Older »