Skip to content

Commit

Permalink
PEP8 compliance
Browse files Browse the repository at this point in the history
  • Loading branch information
gpichot committed Aug 6, 2015
1 parent d85110c commit d780a22
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 6 deletions.
17 changes: 14 additions & 3 deletions paiji2_mettis/fetcher.py
Expand Up @@ -97,16 +97,27 @@ def find_next_stop(self, from_time):

schedule = timetable[0]
for time in timetable[1:]:
if ((from_time.hour >= schedule['hour'] and from_time.minute >= schedule['minutes']) or from_time.hour > schedule['hour']) \
and ((from_time.hour <= time['hour'] and from_time.minute < time['minutes']) or from_time.hour < time['hour']):

gt_schedule = from_time.hour >= schedule['hour']
gt_schedule &= from_time.minute >= schedule['minutes']
gt_schedule = gt_schedule or from_time.hour > schedule['hour']

lt_time = from_time.hour <= time['hour']
lt_time &= from_time.minute < time['minutes']
lt_time = lt_time or from_time.hour < time['hour']

if gt_schedule and lt_time:
schedule = time
break
schedule = time

if schedule is None:
schedule = timetable[0]

return from_time.replace(hour=schedule['hour'], minute=schedule['minutes'])
return from_time.replace(
hour=schedule['hour'],
minute=schedule['minutes'],
)

def next_bus_stops(self, ligne, head, arret, stops_number=1):
key = 'mettis_{ligne}_{head}_{arret}'.format(
Expand Down
11 changes: 8 additions & 3 deletions paiji2_mettis/templatetags/mettis.py
Expand Up @@ -14,10 +14,11 @@ def next_stops_display():
m = MettisFetcher()
stops = []


for stop_setting in settings.METTIS_STOPS:
next_stops = m.next_bus_stops(
stop_setting['line'], stop_setting['direction'], stop_setting['from_stop'],
stop_setting['line'],
stop_setting['direction'],
stop_setting['from_stop'],
stops_number=3,
)
error = None
Expand All @@ -32,5 +33,9 @@ def next_stops_display():
})
return {
'stops': stops,
'url': m.make_url(stop_setting['url_1'], stop_setting['url_2'], stop_setting['url_3']),
'url': m.make_url(
stop_setting['url_1'],
stop_setting['url_2'],
stop_setting['url_3'],
),
}

0 comments on commit d780a22

Please sign in to comment.