git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixes bug #436 (again)
[enigma2.git]
/
ServiceReference.py
diff --git
a/ServiceReference.py
b/ServiceReference.py
index 25181863c1307b638f18620aad99a75b226fc165..11e287860991488d8c332faccee62dedace8caa3 100644
(file)
--- a/
ServiceReference.py
+++ b/
ServiceReference.py
@@
-1,23
+1,22
@@
-
-from enigma import *
-
-import NavigationInstance
+from enigma import eServiceReference, eServiceCenter
class ServiceReference(eServiceReference):
def __init__(self, ref):
class ServiceReference(eServiceReference):
def __init__(self, ref):
- if isinstance(ref, str):
- ref = eServiceReference(ref)
- self.ref = ref
+ if not isinstance(ref, eServiceReference):
+ self.ref = eServiceReference(ref or "")
+ else:
+ self.ref = ref
+ self.serviceHandler = eServiceCenter.getInstance()
- def getStaticServiceInformation(self):
- return NavigationInstance.instance.ServiceHandler.info(self.ref)
-
def __str__(self):
return self.ref.toString()
def getServiceName(self):
def __str__(self):
return self.ref.toString()
def getServiceName(self):
- info = self.getStaticServiceInformation()
- if info is None:
- return None
-
- return info.getName(self.ref)
+ info = self.info()
+ return info and info.getName(self.ref) or ""
+
+ def info(self):
+ return self.serviceHandler.info(self.ref)
+
+ def list(self):
+ return self.serviceHandler.list(self.ref)