Merge branch 'master' of github.com:paultag/python-charlie

paultag · Feb 10, 2012 · f625217 · f625217
2 parents 4c16db2 + 2a66abf
commit f625217
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/charlie/trains.py b/charlie/trains.py
@@ -32,11 +32,10 @@ def getTrip(self):
         return self.name
 
     def getNextEvent(self, f=None):
-        if f == None:
-            f = self.getMostCloseEvent()
-        if f["InformationType"] != "Predicted":
+        f = self.getMostCloseEvent()
+        if f["TargetTime"] < dt.datetime.now(charlie.TIMEZONE):
             try:
-                return self.getNextEvent( self.stopdata[f["next"]] )
+                return self.stopdata[f["next"]]
             except KeyError:
                 return None
         return f