fix possible crash

diff --git a/epgrefresh/src/EPGRefresh.py b/epgrefresh/src/EPGRefresh.py
index 1556d6b..aee63a0 100644 (file)
--- a/epgrefresh/src/EPGRefresh.py
+++ b/epgrefresh/src/EPGRefresh.py
@@ -94,14 +94,14 @@ class EPGRefresh:
                        list.append(' <service')
                        if service.duration is not None:
                                list.extend([' duration="', str(service.duration), '"'])
-                       list.extend(['>', str(service.sref), '</service>\n'])
+                       list.extend(['>', service.sref, '</service>\n'])
                for bouquet in self.services[1]:
                        ref = ServiceReference(bouquet.sref)
                        list.extend([' <!-- ', ref.getServiceName().replace('\xc2\x86', '').replace('\xc2\x87', ''), ' -->\n'])
                        list.append(' <bouquet')
                        if bouquet.duration is not None:
                                list.extend([' duration="', str(bouquet.duration), '"'])
-                       list.extend(['>', str(bouquet.sref), '</bouquet>\n'])
+                       list.extend(['>', bouquet.sref, '</bouquet>\n'])
 
                list.append('\n</epgrefresh>')
 
@@ -174,7 +174,7 @@ class EPGRefresh:
 
                serviceHandler = eServiceCenter.getInstance()
                for bouquet in self.services[1].union(additionalBouquets):
-                       myref = eServiceReference(str(bouquet.sref))
+                       myref = eServiceReference(bouquet.sref)
                        list = serviceHandler.list(myref)
                        if list is not None:
                                while 1:
@@ -189,7 +189,7 @@ class EPGRefresh:
                scanServices = []
                channelIdList = []
                for scanservice in self.services[0].union(additionalServices):
-                       service = eServiceReference(str(scanservice.sref))
+                       service = eServiceReference(scanservice.sref)
                        if not service.valid() \
                                or (service.flags & (eServiceReference.isMarker|eServiceReference.isDirectory)):
 

diff --git a/epgrefresh/src/EPGRefreshChannelEditor.py b/epgrefresh/src/EPGRefreshChannelEditor.py
index f1b00fc..27150c6 100644 (file)
--- a/epgrefresh/src/EPGRefreshChannelEditor.py
+++ b/epgrefresh/src/EPGRefreshChannelEditor.py
@@ -175,7 +175,7 @@ class EPGRefreshServiceEditor(Screen, ConfigListScreen):
                        list.append(getConfigListEntry(
                                _("Refreshing"),
                                ConfigSelection(choices = [(
-                                       EPGRefreshService(args[0].toString(), None),
+                                       EPGRefreshService(str(args[0].toString()), None),
                                        ServiceReference(args[0]).getServiceName().replace('\xc2\x86', '').replace('\xc2\x87', '')
                                )])
                        ))

diff --git a/epgrefresh/src/EPGRefreshService.py b/epgrefresh/src/EPGRefreshService.py
index efb1478..bb95a21 100644 (file)
--- a/epgrefresh/src/EPGRefreshService.py
+++ b/epgrefresh/src/EPGRefreshService.py
@@ -1,6 +1,6 @@
 class EPGRefreshService(object):
        def __init__(self, sref, duration):
-               self.sref = sref
+               self.sref = str(sref)
                self.duration = duration
 
        def __eq__(self, other):

diff --git a/epgrefresh/src/plugin.py b/epgrefresh/src/plugin.py
index b6bcb98..dd0ea74 100644 (file)
--- a/epgrefresh/src/plugin.py
+++ b/epgrefresh/src/plugin.py
@@ -92,7 +92,7 @@ def eventinfo(session, servicelist, **kwargs):
        if pos != -1:
                sref = sref[:pos+1]
 
-       epgrefresh.services[0].add(EPGRefreshService(sref, None))
+       epgrefresh.services[0].add(EPGRefreshService(str(sref), None))
 
 def Plugins(**kwargs):
        return [