TimerEdit.py: fix import name conflict

refs #713

diff --git a/lib/python/Screens/TimerEdit.py b/lib/python/Screens/TimerEdit.py
index 6e8859eeec0f3107873a0f8a8e256d94b70f1034..e9a73ac1eb479f412aeca3ff1ac4a1d87d20c043 100644 (file)
--- 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)