From 1874425448ef3331041e5510d7abf8c2ee9ab2c4 Mon Sep 17 00:00:00 2001 From: Renato Filho Date: Thu, 6 Oct 2011 11:42:28 -0300 Subject: Updated phonon modue to works with python 2.x and 3.x --- tests/phonon/basic_playing_test.py | 4 ++-- tests/phonon/capabilities_test.py | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/phonon/basic_playing_test.py b/tests/phonon/basic_playing_test.py index 49df7d51e..d7664279d 100644 --- a/tests/phonon/basic_playing_test.py +++ b/tests/phonon/basic_playing_test.py @@ -11,7 +11,7 @@ def checkBackendCapabilities(func): if Phonon.BackendCapabilities.isMimeTypeAvailable('audio/x-wav'): func(self, *args, **kw) else: - print 'Wav format not supported! Playback test skipped!' + print('Wav format not supported! Playback test skipped!') return function @@ -60,7 +60,7 @@ class TestSimplePlaying(UsesQCoreApplication): self.media.stateChanged['Phonon::State', 'Phonon::State'].connect(self.state_cb) self.media.play() self.app.exec_() - self.assert_(self.called) + self.assertTrue(self.called) if __name__ == '__main__': diff --git a/tests/phonon/capabilities_test.py b/tests/phonon/capabilities_test.py index 99c647373..cc11a55ff 100644 --- a/tests/phonon/capabilities_test.py +++ b/tests/phonon/capabilities_test.py @@ -1,7 +1,7 @@ import unittest +import py3kcompat as py3k -from PySide.QtCore import * from PySide import phonon from helper import UsesQCoreApplication @@ -16,33 +16,33 @@ class CapabilitiesTest(UsesQCoreApplication): def testExists(self): - self.assert_(phonon.Phonon.BackendCapabilities) + self.assertTrue(phonon.Phonon.BackendCapabilities) def testNotifierIdentity(self): # Notifier is a singleton self.assertEqual(phonon.Phonon.BackendCapabilities.notifier(), phonon.Phonon.BackendCapabilities.notifier()) - self.assert_(phonon.Phonon.BackendCapabilities.notifier() is + self.assertTrue(phonon.Phonon.BackendCapabilities.notifier() is phonon.Phonon.BackendCapabilities.notifier()) def testDevices(self): # TODO Improve this test devices = phonon.Phonon.BackendCapabilities.availableAudioOutputDevices() for device in devices: - self.assert_(isinstance(device, phonon.Phonon.AudioOutputDevice)) + self.assertTrue(isinstance(device, phonon.Phonon.AudioOutputDevice)) def testMimeTypes(self): # TODO Improve this test mimeTypes = phonon.Phonon.BackendCapabilities.availableMimeTypes() for mime in mimeTypes: - self.assert_(isinstance(mime, unicode)) + self.assertTrue(isinstance(mime, py3k.unicode)) def testAudioEffects(self): # TODO Improve this test effects = phonon.Phonon.BackendCapabilities.availableAudioEffects() for effect in effects: - self.assert_(isinstance(effect, phonon.Phonon.EffectDescription)) + self.assertTrue(isinstance(effect, phonon.Phonon.EffectDescription)) if __name__ == '__main__': unittest.main() -- cgit v1.2.3