raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

PEP8

Browse Source
This commit is contained in:
Jonathan Springer 2015-11-06 20:09:32 -05:00
parent 7af1ca1d49
commit 285e12bc9d
16 changed files with 38 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openlp/core/ui/media/mediacontroller.py
View File

@ -476,9 +476,9 @@ class MediaController(RegistryMixin, OpenLPMixin, RegistryProperties):
controller.media_info.media_type = MediaType.CD controller.media_info.media_type = MediaType.CD
else: else:
controller.media_info.media_type = MediaType.DVD controller.media_info.media_type = MediaType.DVD
controller.media_info.start_time = start/1000 controller.media_info.start_time = start / 1000
controller.media_info.end_time = end/1000 controller.media_info.end_time = end / 1000
controller.media_info.length = (end - start)/1000 controller.media_info.length = (end - start) / 1000
controller.media_info.title_track = title controller.media_info.title_track = title
controller.media_info.audio_track = audio_track controller.media_info.audio_track = audio_track
controller.media_info.subtitle_track = subtitle_track controller.media_info.subtitle_track = subtitle_track

3
openlp/core/ui/media/systemplayer.py
View File

@ -256,6 +256,3 @@ class SystemPlayer(MediaPlayer):
'</strong><br/>' + str(self.audio_extensions_list) + '</strong><br/>' + str(self.audio_extensions_list) +
'<br/><strong>' + translate('Media.player', 'Video') + '<br/><strong>' + translate('Media.player', 'Video') +
'</strong><br/>' + str(self.video_extensions_list) + '<br/>') '</strong><br/>' + str(self.video_extensions_list) + '<br/>')

2
openlp/core/ui/projector/sourceselectform.py
View File

@ -443,7 +443,7 @@ class SourceSelectSingle(QDialog):
QtWidgets.QDialogButtonBox.Cancel) QtWidgets.QDialogButtonBox.Cancel)
self.button_box.clicked.connect(self.button_clicked) self.button_box.clicked.connect(self.button_clicked)
self.layout.addWidget(self.button_box) self.layout.addWidget(self.button_box)
self.setMinimumHeight(key_count*25) self.setMinimumHeight(key_count * 25)
set_button_tooltip(self.button_box) set_button_tooltip(self.button_box)
selected = super(SourceSelectSingle, self).exec() selected = super(SourceSelectSingle, self).exec()
return selected return selected

4
openlp/plugins/presentations/lib/pptviewcontroller.py
View File

@ -184,13 +184,13 @@ class PptviewDocument(PresentationDocument):
# check if it is a slide # check if it is a slide
match = re.search("slides/slide(.+)\.xml", zip_info.filename) match = re.search("slides/slide(.+)\.xml", zip_info.filename)
if match: if match:
index = int(match.group(1))-1 index = int(match.group(1)) - 1
node_type = 'ctrTitle' node_type = 'ctrTitle'
list_to_add = titles list_to_add = titles
# or a note # or a note
match = re.search("notesSlides/notesSlide(.+)\.xml", zip_info.filename) match = re.search("notesSlides/notesSlide(.+)\.xml", zip_info.filename)
if match: if match:
index = int(match.group(1))-1 index = int(match.group(1)) - 1
node_type = 'body' node_type = 'body'
list_to_add = notes list_to_add = notes
# if it is one of our files, index shouldn't be -1 # if it is one of our files, index shouldn't be -1

6
openlp/plugins/songs/forms/editsongform.py
View File

@ -281,9 +281,9 @@ class EditSongForm(QtWidgets.QDialog, Ui_EditSongDialog, RegistryProperties):
return True return True
if len(tags) % 2 != 0: if len(tags) % 2 != 0:
return False return False
for i in range(len(tags)-1): for i in range(len(tags) - 1):
if tags[i+1] == "{/" + tags[i][1:]: if tags[i + 1] == "{/" + tags[i][1:]:
del tags[i:i+2] del tags[i:i + 2]
return self._validate_tags(tags, False) return self._validate_tags(tags, False)
return False return False

2
openlp/plugins/songs/lib/importers/easyworship.py
View File

@ -123,7 +123,7 @@ class EasyWorshipSongImport(SongImport):
log.debug('Given ews file is of unknown version.') log.debug('Given ews file is of unknown version.')
return return
entry_count = self.get_i32(file_pos) entry_count = self.get_i32(file_pos)
entry_length = self.get_i16(file_pos+4) entry_length = self.get_i16(file_pos + 4)
file_pos += 6 file_pos += 6
self.import_wizard.progress_bar.setMaximum(entry_count) self.import_wizard.progress_bar.setMaximum(entry_count)
# Loop over songs # Loop over songs

4
openlp/plugins/songs/lib/importers/opensong.py
View File

@ -171,12 +171,12 @@ class OpenSongImport(SongImport):
topics = set(self.topics) topics = set(self.topics)
if 'theme' in fields: if 'theme' in fields:
theme = str(root.theme) theme = str(root.theme)
subthemes = theme[theme.find(':')+1:].split('/') subthemes = theme[theme.find(':') + 1:].split('/')
for topic in subthemes: for topic in subthemes:
topics.add(topic.strip()) topics.add(topic.strip())
if 'alttheme' in fields: if 'alttheme' in fields:
theme = str(root.alttheme) theme = str(root.alttheme)
subthemes = theme[theme.find(':')+1:].split('/') subthemes = theme[theme.find(':') + 1:].split('/')
for topic in subthemes: for topic in subthemes:
topics.add(topic.strip()) topics.add(topic.strip())
self.topics = list(topics) self.topics = list(topics)

2
scripts/lp-merge.py
View File

@ -96,7 +96,7 @@ for row in bug_rows:
# <div class="context-publication"><h1>Merge ... into... # <div class="context-publication"><h1>Merge ... into...
div_branches = soup.find('div', class_='context-publication') div_branches = soup.find('div', class_='context-publication')
branches = div_branches.h1.contents[0] branches = div_branches.h1.contents[0]
target_branch = '+branch/' + branches[(branches.find(' into lp:')+9):] target_branch = '+branch/' + branches[(branches.find(' into lp:') + 9):]
# Check that we are in the right branch # Check that we are in the right branch
bzr_info_output = subprocess.check_output(['bzr', 'info']) bzr_info_output = subprocess.check_output(['bzr', 'info'])