diff --git a/openlp/plugins/presentations/lib/pptviewlib/ppttest.py b/openlp/plugins/presentations/lib/pptviewlib/ppttest.py index c8573c807..f07468bb8 100644 --- a/openlp/plugins/presentations/lib/pptviewlib/ppttest.py +++ b/openlp/plugins/presentations/lib/pptviewlib/ppttest.py @@ -174,13 +174,13 @@ class PPTViewer(QtGui.QWidget): 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 @@ class PPTViewer(QtGui.QWidget): 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 @@ class PPTViewer(QtGui.QWidget): 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 diff --git a/openlp/plugins/songs/lib/test/test_opensongimport.py b/openlp/plugins/songs/lib/test/test_opensongimport.py index 8f09ea875..3d367a166 100644 --- a/openlp/plugins/songs/lib/test/test_opensongimport.py +++ b/openlp/plugins/songs/lib/test/test_opensongimport.py @@ -89,7 +89,7 @@ def test(): 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 @@ def test(): 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 @@ def test(): 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()