[totem] dbusservice: do not use unicode which does not exists in python 3
- From: Ignacio Casal Quinteiro <icq src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [totem] dbusservice: do not use unicode which does not exists in python 3
- Date: Tue, 30 Apr 2013 13:18:29 +0000 (UTC)
commit 3d76122be59abe3db9208fbcfe0123b8b3922bc0
Author: Ignacio Casal Quinteiro <icq gnome org>
Date: Tue Apr 30 15:17:56 2013 +0200
dbusservice: do not use unicode which does not exists in python 3
src/plugins/dbusservice/dbusservice.py | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/src/plugins/dbusservice/dbusservice.py b/src/plugins/dbusservice/dbusservice.py
index e7a5339..45758a9 100644
--- a/src/plugins/dbusservice/dbusservice.py
+++ b/src/plugins/dbusservice/dbusservice.py
@@ -57,9 +57,9 @@ class Root (dbus.service.Object): # pylint: disable-msg=R0923,R0904
self.totem = totem
self.null_metadata = {
- 'year' : u'', 'tracknumber' : '', 'location' : '',
- 'title' : u'', 'album' : u'', 'time' : u'', 'genre' : u'',
- 'artist' : u''
+ 'year' : '', 'tracknumber' : '', 'location' : '',
+ 'title' : '', 'album' : '', 'time' : '', 'genre' : '',
+ 'artist' : ''
}
self.current_metadata = self.null_metadata.copy ()
self.current_position = 0
@@ -120,11 +120,11 @@ class Root (dbus.service.Object): # pylint: disable-msg=R0923,R0904
title, album, num):
self.current_metadata = self.null_metadata.copy ()
if title:
- self.current_metadata['title'] = unicode (title, 'utf-8')
+ self.current_metadata['title'] = title
if artist:
- self.current_metadata['artist'] = unicode (artist, 'utf-8')
+ self.current_metadata['artist'] = artist
if album:
- self.current_metadata['album'] = unicode (album, 'utf-8')
+ self.current_metadata['album'] = album
if num:
self.current_metadata['tracknumber'] = num
@@ -210,7 +210,7 @@ class Root (dbus.service.Object): # pylint: disable-msg=R0923,R0904
raise dbus.exceptions.DBusException (
'org.mpris.MediaPlayer2.UnknownInterface',
- _(u'The MediaPlayer2 object does not implement the ‘%s’ interface')
+ _('The MediaPlayer2 object does not implement the ‘%s’ interface')
% interface_name)
@dbus.service.method (dbus_interface = dbus.PROPERTIES_IFACE,
@@ -219,7 +219,7 @@ class Root (dbus.service.Object): # pylint: disable-msg=R0923,R0904
if interface_name == 'org.mpris.MediaPlayer2':
raise dbus.exceptions.DBusException (
'org.mpris.MediaPlayer2.ReadOnlyProperty',
- _(u'The property ‘%s’ is not writeable.'))
+ _('The property ‘%s’ is not writeable.'))
elif interface_name == 'org.mpris.MediaPlayer2.Player':
if property_name == 'LoopStatus':
self.totem.action_remote_set_setting (
@@ -235,12 +235,12 @@ class Root (dbus.service.Object): # pylint: disable-msg=R0923,R0904
raise dbus.exceptions.DBusException (
'org.mpris.MediaPlayer2.ReadOnlyProperty',
- _(u'Unknown property ‘%s’ requested of a MediaPlayer 2 object')
+ _('Unknown property ‘%s’ requested of a MediaPlayer 2 object')
% interface_name)
raise dbus.exceptions.DBusException (
'org.mpris.MediaPlayer2.UnknownInterface',
- _(u'The MediaPlayer2 object does not implement the ‘%s’ interface')
+ _('The MediaPlayer2 object does not implement the ‘%s’ interface')
% interface_name)
@dbus.service.signal (dbus_interface = dbus.PROPERTIES_IFACE,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]