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

fixed a pep-issue in songs-lib and corrected a comment in a test

Browse Source
This commit is contained in:
Stefan Strasser 2014-04-26 07:07:08 +02:00
parent 1cd7d73d10
commit c2d1589dcb
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openlp/plugins/songs/lib/__init__.py
View File

@ -213,7 +213,7 @@ class VerseType(object):
for num, tag in enumerate(VerseType.tags): for num, tag in enumerate(VerseType.tags):
if verse_tag == tag: if verse_tag == tag:
return num return num
if default in range(0,len(VerseType.names)) or default is None: if default in range(0, len(VerseType.names)) or default is None:
return default return default
else: else:
return VerseType.Other return VerseType.Other
@ -231,7 +231,7 @@ class VerseType(object):
for num, tag in enumerate(VerseType.translated_tags): for num, tag in enumerate(VerseType.translated_tags):
if verse_tag == tag: if verse_tag == tag:
return num return num
if default in range(0,len(VerseType.names)) or default is None: if default in range(0, len(VerseType.names)) or default is None:
return default return default
else: else:
return VerseType.Other return VerseType.Other

2
tests/functional/openlp_plugins/songs/test_lib.py
View File

@ -484,5 +484,5 @@ class TestVerseType(TestCase):
# WHEN: We run the from_tag() method with an invalid verse type, we get the specified default back # WHEN: We run the from_tag() method with an invalid verse type, we get the specified default back
result = VerseType.from_tag('m', None) result = VerseType.from_tag('m', None)
# THEN: The result should be VerseType.Other # THEN: The result should be None
self.assertIsNone(result, 'The result should be None, but was "%s"' % result) self.assertIsNone(result, 'The result should be None, but was "%s"' % result)