git.cweiske.de
/
enigma2.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
52a1005
)
timer: don't use try/except, don't encode numbers to UTF8, don't save eit= entry...
author
Felix Domke
<tmbinc@elitedvb.net>
Fri, 17 Feb 2006 18:38:32 +0000
(18:38 +0000)
committer
Felix Domke
<tmbinc@elitedvb.net>
Fri, 17 Feb 2006 18:38:32 +0000
(18:38 +0000)
RecordTimer.py
patch
|
blob
|
history
diff --git
a/RecordTimer.py
b/RecordTimer.py
index 2835a3881f5791e7ffca13426d36689da452a718..9bb1da7107a17168dfe4de5b0018b72dc2bfba88 100644
(file)
--- a/
RecordTimer.py
+++ b/
RecordTimer.py
@@
-189,14
+189,12
@@
def createTimer(xml):
serviceref = ServiceReference(str(xml.getAttribute("serviceref")))
description = xml.getAttribute("description").encode("utf-8")
repeated = xml.getAttribute("repeated").encode("utf-8")
serviceref = ServiceReference(str(xml.getAttribute("serviceref")))
description = xml.getAttribute("description").encode("utf-8")
repeated = xml.getAttribute("repeated").encode("utf-8")
- try:
- disabled = eval(xml.getAttribute("disabled"))
- except:
- disabled = False
- try:
- eit = long(xml.getAttribute("eit").encode("utf-8"))
- except:
+ disabled = long(xml.getAttribute("disabled") or "0")
+ if xml.hasAttribute("eit") and xml.getAttribute("eit") != "None":
+ eit = long(xml.getAttribute("eit"))
+ else:
eit = None
eit = None
+
name = xml.getAttribute("name").encode("utf-8")
#filename = xml.getAttribute("filename").encode("utf-8")
entry = RecordTimerEntry(serviceref, begin, end, name, description, eit, disabled)
name = xml.getAttribute("name").encode("utf-8")
#filename = xml.getAttribute("filename").encode("utf-8")
entry = RecordTimerEntry(serviceref, begin, end, name, description, eit, disabled)
@@
-296,7
+294,8
@@
class RecordTimer(timer.Timer):
list.append(' repeated="' + str(int(timer.repeated)) + '"')
list.append(' name="' + str(self.strToXML(timer.name)) + '"')
list.append(' description="' + str(self.strToXML(timer.description)) + '"')
list.append(' repeated="' + str(int(timer.repeated)) + '"')
list.append(' name="' + str(self.strToXML(timer.name)) + '"')
list.append(' description="' + str(self.strToXML(timer.description)) + '"')
- list.append(' eit="' + str(timer.eit) + '"')
+ if timer.eit is not None:
+ list.append(' eit="' + str(timer.eit) + '"')
list.append(' disabled="' + str(int(timer.disabled)) + '"')
list.append('>\n')
list.append(' disabled="' + str(int(timer.disabled)) + '"')
list.append('>\n')