2025-summer/team-3
12
Fork 0
Code Issues Pull requests Projects Releases Activity

satisfy linter and type checker in many places

Browse source
This commit is contained in:
Laura Klünder 2022-04-03 20:19:41 +02:00
parent 9d21f8c933
commit fb4da7c768
16 changed files with 38 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/c3nav/routing/locator.py
View file

@ -108,7 +108,7 @@ class LocatorStations:
station = self.stations[station_id]
station.frequencies.add(frequency)
elif create:
station = LocatorStation(bssid, ssid, set((frequency, )))
station = LocatorStation(bssid, ssid, {frequency})
station_id = len(self.stations)
self.stations_lookup[(bssid, None)] = station_id
self.stations.append(station)

9
src/c3nav/routing/route.py
View file

@ -95,6 +95,7 @@ class Route:
description = item.waytype.description
if item.waytype.up_separate and item.edge.rise > 0:
description = item.waytype.description_up
# noinspection PyComparisonWithNone
if (item.waytype.level_change_description != False and last_primary_level and
((item.last_item and item.level != item.last_item.level) or
item.level.on_top_of_id)): # != False because it's lazy
@ -124,8 +125,9 @@ class Route:
description = current_space.leave_descriptions.get(next_space.pk, None)
if description is None:
description = item.space.enter_description
# noinspection PyComparisonWithNone
if description == None: # could be a lazy None
description = _('Go to %(space_title)s.') % {'space_title': item.space.title}
description = _('Go to %(space_title)s.') % {'space_title': item.space.title}
item.descriptions.append(('more_vert', description))
@ -140,7 +142,9 @@ class Route:
if item.edge:
remaining_distance += item.edge.distance
if remaining_distance:
item.descriptions.append(('more_vert', _('%d m remaining to your destination.') % max(remaining_distance, 1)))
item.descriptions.append(
('more_vert', _('%d m remaining to your destination.') % max(remaining_distance, 1))
)
items[-1].descriptions.append(('done', _('You have reached your destination.')))
@ -240,6 +244,5 @@ class RouteItem:
return result
class NoRoute:
distance = np.inf