Troplo/PlexKodiConnect
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix class __repr__ to account for Python 3

Browse source
This commit is contained in:
croneter 2020-12-18 19:59:33 +01:00
parent f771b8d3aa
commit 4b4dc1afbf
4 changed files with 5 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
resources/lib/library_sync/sections.py
View file

@ -94,8 +94,7 @@ class Section(object):
"'section_type': '{self.section_type}', " "'section_type': '{self.section_type}', "
"'sync_to_kodi': {self.sync_to_kodi}, " "'sync_to_kodi': {self.sync_to_kodi}, "
"'last_sync': {self.last_sync}" "'last_sync': {self.last_sync}"
"}}").format(self=self).encode('utf-8') "}}").format(self=self)
__str__ = __repr__
def __bool__(self): def __bool__(self):
return (self.section_id is not None and return (self.section_id is not None and

11
resources/lib/playlist_func.py
View file

@ -86,12 +86,8 @@ class Playqueue_Object(object):
"'repeat': {self.repeat}, " "'repeat': {self.repeat}, "
"'kodi_playlist_playback': {self.kodi_playlist_playback}, " "'kodi_playlist_playback': {self.kodi_playlist_playback}, "
"'pkc_edit': {self.pkc_edit}, ".format(self=self)) "'pkc_edit': {self.pkc_edit}, ".format(self=self))
answ = answ.encode('utf-8')
# Since list.__repr__ will return string, not unicode # Since list.__repr__ will return string, not unicode
return answ + b"'items': {self.items}}}".format(self=self) return answ + "'items': {self.items}}}".format(self=self)
def __str__(self):
return self.__repr__()
def is_pkc_clear(self): def is_pkc_clear(self):
""" """
@ -201,7 +197,7 @@ class PlaylistItem(object):
def uri(self): def uri(self):
return self._uri return self._uri
def __unicode__(self): def __repr__(self):
return ("{{" return ("{{"
"'id': {self.id}, " "'id': {self.id}, "
"'plex_id': {self.plex_id}, " "'plex_id': {self.plex_id}, "
@ -217,9 +213,6 @@ class PlaylistItem(object):
"'force_transcode': {self.force_transcode}, " "'force_transcode': {self.force_transcode}, "
"'part': {self.part}".format(self=self)) "'part': {self.part}".format(self=self))
def __repr__(self):
return self.__unicode__().encode('utf-8')
def plex_stream_index(self, kodi_stream_index, stream_type): def plex_stream_index(self, kodi_stream_index, stream_type):
""" """
Pass in the kodi_stream_index [int] in order to receive the Plex stream Pass in the kodi_stream_index [int] in order to receive the Plex stream

8
resources/lib/playlists/common.py
View file

@ -64,7 +64,7 @@ class Playlist(object):
self.kodi_type = None self.kodi_type = None
self.kodi_hash = None self.kodi_hash = None
def __unicode__(self): def __repr__(self):
return ("{{" return ("{{"
"'plex_id': {self.plex_id}, " "'plex_id': {self.plex_id}, "
"'plex_name': '{self.plex_name}', " "'plex_name': '{self.plex_name}', "
@ -75,12 +75,6 @@ class Playlist(object):
"'kodi_hash': '{self.kodi_hash}'" "'kodi_hash': '{self.kodi_hash}'"
"}}").format(self=self) "}}").format(self=self)
def __repr__(self):
return self.__unicode__().encode('utf-8')
def __str__(self):
return self.__repr__()
def __bool__(self): def __bool__(self):
return (self.plex_id and self.plex_updatedat and self.plex_name and return (self.plex_id and self.plex_updatedat and self.plex_name and
self._kodi_path and self.kodi_filename and self.kodi_type and self._kodi_path and self.kodi_filename and self.kodi_type and

5
resources/lib/utils.py
View file

@ -267,14 +267,11 @@ class AttributeDict(dict):
def __setattr__(self, attr, value): def __setattr__(self, attr, value):
self[attr] = value self[attr] = value
def __unicode__(self): def __repr__(self):
return '<{0}:{1}:{2}>'.format(self.__class__.__name__, return '<{0}:{1}:{2}>'.format(self.__class__.__name__,
self.id, self.id,
self.get('title', 'None')) self.get('title', 'None'))
def __repr__(self):
return self.__unicode__().encode('utf-8')
def cast(func, value): def cast(func, value):
""" """