From: ghost <andreas.monzner@multimedia-labs.de>
Date: Sat, 19 Mar 2011 21:57:15 +0000 (+0100)
Subject: TimerEdit.py: fix import name conflict
X-Git-Tag: 3.1.0~1^2
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/10f779bd487379e0a9aec80e586c562e2ac71273

TimerEdit.py: fix import name conflict
refs #713
---

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)