openlp-core team mailing list archive

[Andreas Preikschat <googol@xxxxxxxx>]

Andreas Preikschat has proposed merging lp:~googol-hush/openlp/trivial into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)


Only trivial changes:

- whitespaces
- two lines at the end of a file
- two lines of code -> one line of code


-- 
https://code.launchpad.net/~googol-hush/openlp/trivial/+merge/38507
Your team OpenLP Core is requested to review the proposed merge of lp:~googol-hush/openlp/trivial into lp:openlp.

=== modified file 'openlp/core/lib/serviceitem.py'
--- openlp/core/lib/serviceitem.py	2010-10-08 20:42:25 +0000
+++ openlp/core/lib/serviceitem.py	2010-10-15 08:39:05 +0000
@@ -399,6 +399,6 @@
 
     def get_frame_path(self, row=0):
         """
-        Returns the title of the raw frame
+        Returns the path of the raw frame
         """
         return self._raw_frames[row][u'path']

=== modified file 'openlp/core/ui/slidecontroller.py'
--- openlp/core/ui/slidecontroller.py	2010-10-07 21:49:25 +0000
+++ openlp/core/ui/slidecontroller.py	2010-10-15 08:39:05 +0000
@@ -999,4 +999,3 @@
             self.video.hide()
         self.SlidePreview.clear()
         self.SlidePreview.show()
-

=== modified file 'openlp/plugins/songs/lib/songbeamerimport.py'
--- openlp/plugins/songs/lib/songbeamerimport.py	2010-09-29 20:37:52 +0000
+++ openlp/plugins/songs/lib/songbeamerimport.py	2010-10-15 08:39:05 +0000
@@ -127,11 +127,10 @@
                 self.import_wizard.incrementProgressBar(
                     "Importing %s" % (self.file_name))
             return True
-            
+
     def parse_tags(self, line):
         tag_val = line.split('=')
-        if len(tag_val[0]) == 0 or \
-            len(tag_val[1]) == 0:
+        if len(tag_val[0]) == 0 or len(tag_val[1]) == 0:
             return True
         if tag_val[0] == '#(c)':
             self.add_copyright(tag_val[1])
@@ -225,11 +224,10 @@
         else:
             pass
         return True
-        
+
     def check_verse_marks(self, line):
         marks = line.split(' ')
-        if len(marks) <= 2 and \
-            marks[0] in SongBeamerTypes.MarkTypes:
+        if len(marks) <= 2 and marks[0] in SongBeamerTypes.MarkTypes:
             self.current_verse_type = SongBeamerTypes.MarkTypes[marks[0]]
             if len(marks) == 2:
                 #TODO: may check, because of only digits are allowed