openlp-core team mailing list archive

[Andreas Preikschat <andreaspreikschat@xxxxxxxxxx>]

Andreas Preikschat has proposed merging lp:~googol/openlp/print-func into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~googol/openlp/print-func/+merge/172244

Converted last print statements to print functions.

BTW, somehow the files are a bit lost there... remove them? I bet they haven't been touched in ages....
-- 
https://code.launchpad.net/~googol/openlp/print-func/+merge/172244
Your team OpenLP Core is requested to review the proposed merge of lp:~googol/openlp/print-func into lp:openlp.

=== modified file 'openlp/plugins/presentations/lib/pptviewlib/ppttest.py'
--- openlp/plugins/presentations/lib/pptviewlib/ppttest.py	2013-02-04 21:26:27 +0000
+++ openlp/plugins/presentations/lib/pptviewlib/ppttest.py	2013-06-30 18:06:27 +0000
@@ -174,13 +174,13 @@
             int(self.widthEdit.text()), int(self.heightEdit.text()))
         filename = str(self.pptEdit.text().replace(u'/', u'\\'))
         folder = str(self.folderEdit.text().replace(u'/', u'\\'))
-        print filename, folder
+        print(filename, folder)
         self.pptid = self.pptdll.OpenPPT(filename, None, rect, folder)
-        print u'id: ' + unicode(self.pptid)
+        print(u'id: ' + unicode(self.pptid))
         if oldid >= 0:
             self.pptdll.ClosePPT(oldid);
         slides = self.pptdll.GetSlideCount(self.pptid)
-        print u'slidecount: ' + unicode(slides)
+        print(u'slidecount: ' + unicode(slides))
         self.total.setNum(self.pptdll.GetSlideCount(self.pptid))
         self.updateCurrSlide()
 
@@ -188,14 +188,14 @@
         if self.pptid < 0:
             return
         slide = unicode(self.pptdll.GetCurrentSlide(self.pptid))
-        print u'currslide: ' + slide
+        print(u'currslide: ' + slide)
         self.slideEdit.setText(slide)
         app.processEvents()
 
     def gotoClick(self):
         if self.pptid < 0:
             return
-        print self.slideEdit.text()
+        print(self.slideEdit.text())
         self.pptdll.GotoSlide(self.pptid, int(self.slideEdit.text()))
         self.updateCurrSlide()
         app.processEvents()
@@ -207,7 +207,7 @@
 if __name__ == '__main__':
     pptdll = cdll.LoadLibrary(r'pptviewlib.dll')
     pptdll.SetDebug(1)
-    print u'Begin...'
+    print(u'Begin...')
     app = QtGui.QApplication(sys.argv)
     window = PPTViewer()
     window.pptdll = pptdll

=== modified file 'openlp/plugins/songs/lib/test/test_opensongimport.py'
--- openlp/plugins/songs/lib/test/test_opensongimport.py	2012-12-29 20:56:56 +0000
+++ openlp/plugins/songs/lib/test/test_opensongimport.py	2013-06-30 18:06:27 +0000
@@ -89,7 +89,7 @@
     assert not [u'C3', u'Chorus 3'] in o.verses
     assert [u'V1', u'v1 Line 1\nV1 Line 2'] in o.verses
     assert [u'V2', u'v2 Line 1\nV2 Line 2'] in o.verses
-    print o.verse_order_list
+    print(o.verse_order_list)
     assert o.verse_order_list == [u'V1', u'C1', u'V2', u'C2', u'V3', u'B1', u'V1']
 
     o.filenames = [u'test2.opensong']
@@ -101,14 +101,14 @@
     assert o.title == u'Martins 2nd Test'
     assert o.alternate_title == u''
     assert o.song_number == u'2'
-    print o.verses
+    print(o.verses)
     assert [u'B1', u'Bridge 1\nBridge 1 line 2'] in o.verses
     assert [u'C1', u'Chorus 1'] in o.verses
     assert [u'C2', u'Chorus 2'] in o.verses
     assert not [u'C3', u'Chorus 3'] in o.verses
     assert [u'V1', u'v1 Line 1\nV1 Line 2'] in o.verses
     assert [u'V2', u'v2 Line 1\nV2 Line 2'] in o.verses
-    print o.verse_order_list
+    print(o.verse_order_list)
     assert o.verse_order_list == [u'V1', u'V2', u'B1', u'C1', u'C2']
 
     o.filenames = [u'test3.opensong']
@@ -122,10 +122,10 @@
     assert o.ccli_number == u'123456'
     assert o.verse_order_list == [u'V1']
     assert o.topics == [u'Worship: Declaration']
-    print o.verses[0]
+    print(o.verses[0])
     assert [u'V1', u'Line 1\nLine 2'] in o.verses
 
-    print "Tests passed"
+    print("Tests passed")
 
 if __name__ == "__main__":
     test()