diff options
| author | ghost <andreas.monzner@multimedia-labs.de> | 2011-03-19 22:57:15 +0100 |
|---|---|---|
| committer | ghost <andreas.monzner@multimedia-labs.de> | 2011-03-19 22:57:15 +0100 |
| commit | 10f779bd487379e0a9aec80e586c562e2ac71273 (patch) | |
| tree | 2e67090b17a43df46c173ac44f32a1d4e27a0b03 /lib | |
| parent | 33a8f42447b5f3655b47f15f7c2a4cf45af5c4bb (diff) | |
| download | enigma2-10f779bd487379e0a9aec80e586c562e2ac71273.tar.gz enigma2-10f779bd487379e0a9aec80e586c562e2ac71273.zip | |
TimerEdit.py: fix import name conflict
refs #713
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/python/Screens/TimerEdit.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/python/Screens/TimerEdit.py b/lib/python/Screens/TimerEdit.py index 6e8859ee..e9a73ac1 100644 --- a/lib/python/Screens/TimerEdit.py +++ b/lib/python/Screens/TimerEdit.py @@ -13,7 +13,7 @@ from ServiceReference import ServiceReference from TimerEntry import TimerEntry, TimerLog from Tools.BoundFunction import boundFunction from time import time -from timer import TimerEntry +from timer import TimerEntry as RealTimerEntry class TimerEditList(Screen): EMPTY = 0 @@ -175,7 +175,7 @@ class TimerEditList(Screen): def fillTimerList(self): #helper function to move finished timers to end of list def eol_compare(x, y): - if x[0].state != y[0].state and x[0].state == TimerEntry.StateEnded or y[0].state == TimerEntry.StateEnded: + if x[0].state != y[0].state and x[0].state == RealTimerEntry.StateEnded or y[0].state == RealTimerEntry.StateEnded: return cmp(x[0].state, y[0].state) return cmp(x[0].begin, x[1].begin) |