spacecruft
/
satnogs-network
1
0
Fork 0
Code Releases Activity

Merge branch 'fix/pylint1' into 'master' 

Some py3-pylint fixes

See merge request librespacefoundation/satnogs/satnogs-network!787
merge-requests/787/merge
Fabian P. Schmidt 2019-11-14 23:39:17 +00:00
parent 8d22042156 882c0bc734
commit 7972fad3f6
10 changed files with 78 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
network/api/tests.py
View File

@ -1,3 +1,5 @@
from builtins import range
import json
from django.test import TestCase
@ -18,9 +20,9 @@ class JobViewApiTest(TestCase):
stations = []
def setUp(self):
for _ in xrange(1, 10):
for _ in range(1, 10):
self.satellites.append(SatelliteFactory())
for _ in xrange(1, 10):
for _ in range(1, 10):
self.stations.append(StationFactory())
self.observation = ObservationFactory()

27
network/base/db_api.py
View File

@ -46,17 +46,18 @@ def get_transmitters_by_uuid_list(uuid_list):
if not transmitter:
raise ValueError('Invalid Transmitter UUID: {0}'.format(str(uuid_list[0])))
return {transmitter[0]['uuid']: transmitter[0]}
else:
transmitters_list = get_transmitters()
transmitters = {t['uuid']: t for t in transmitters_list if t['uuid'] in uuid_list}
invalid_transmitters = [
str(uuid) for uuid in set(uuid_list).difference(set(transmitters.keys()))
]
if not invalid_transmitters:
return transmitters
else:
if len(invalid_transmitters) == 1:
raise ValueError('Invalid Transmitter UUID: {0}'.format(invalid_transmitters[0]))
else:
raise ValueError('Invalid Transmitter UUIDs: {0}'.format(invalid_transmitters))
transmitters_list = get_transmitters()
transmitters = {t['uuid']: t for t in transmitters_list if t['uuid'] in uuid_list}
invalid_transmitters = [
str(uuid) for uuid in set(uuid_list).difference(set(transmitters.keys()))
]
if not invalid_transmitters:
return transmitters
if len(invalid_transmitters) == 1:
raise ValueError('Invalid Transmitter UUID: {0}'.format(invalid_transmitters[0]))
raise ValueError('Invalid Transmitter UUIDs: {0}'.format(invalid_transmitters))

4
network/base/models.py
View File

@ -1,3 +1,5 @@
from builtins import range
import logging
import os
from datetime import timedelta
@ -518,7 +520,7 @@ class DemodData(models.Model):
return unicode(payload)
except UnicodeDecodeError:
data = payload.encode('hex').upper()
return ' '.join(data[i:i + 2] for i in xrange(0, len(data), 2))
return ' '.join(data[i:i + 2] for i in range(0, len(data), 2))
@receiver(models.signals.post_delete, sender=DemodData)

9
network/base/perms.py
View File

@ -66,11 +66,10 @@ def check_schedule_perms_per_station(user, station_list):
stations_without_permissions[0]
)
)
else:
raise UserNoPermissionError(
'No permission to schedule observations on stations: {0}'.
format(stations_without_permissions)
)
raise UserNoPermissionError(
'No permission to schedule observations on stations: {0}'.
format(stations_without_permissions)
)
def delete_perms(user, observation):

5
network/base/scheduling.py
View File

@ -38,7 +38,7 @@ def max_altitude_in_window(observer, satellite, pass_tca, window_start, window_e
# Observation window in the second half of the pass
# Thus highest altitude right at the beginning of the window
return get_altitude(observer, satellite, window_start)
elif window_end < pass_tca:
if window_end < pass_tca:
# Observation window in the first half of the pass
# Thus highest altitude right at the end of the window
return get_altitude(observer, satellite, window_end)
@ -122,7 +122,8 @@ def create_station_windows(scheduled_obs, overlapped, pass_params, observer, sat
# Windows changed due to overlap, recalculate observation parameters
if overlapped == 0:
return []
elif overlapped == 1:
if overlapped == 1:
initial_duration = (pass_params['set_time'] - pass_params['rise_time']).total_seconds()
for window_start, window_end in windows:
altitude = max_altitude_in_window(

10
network/base/tasks.py
View File

@ -1,3 +1,5 @@
from __future__ import print_function
import json
import os
import urllib2
@ -27,7 +29,7 @@ def update_all_tle():
manual_tle=True, norad_follow_id__isnull=True
).prefetch_related(Prefetch('tles', queryset=latest_tle_queryset, to_attr='tle'))
print "==Fetching TLEs=="
print("==Fetching TLEs==")
for obj in satellites:
norad_id = obj.norad_cat_id
@ -38,16 +40,16 @@ def update_all_tle():
# Fetch latest satellite TLE
tle = fetch_tle_from_celestrak(norad_id)
except LookupError:
print '{} - {}: TLE not found [error]'.format(obj.name, norad_id)
print('{} - {}: TLE not found [error]'.format(obj.name, norad_id))
continue
if obj.tle and obj.tle[0].tle1 == tle[1]:
# Stored TLE is already the latest available for this satellite
print '{} - {}: TLE already exists [defer]'.format(obj.name, norad_id)
print('{} - {}: TLE already exists [defer]'.format(obj.name, norad_id))
continue
Tle.objects.create(tle0=tle[0], tle1=tle[1], tle2=tle[2], satellite=obj)
print '{} - {}: new TLE found [updated]'.format(obj.name, norad_id)
print('{} - {}: new TLE found [updated]'.format(obj.name, norad_id))
@APP.task(ignore_result=True)

2
network/base/templatetags/paginator.py
View File

@ -25,7 +25,7 @@ def paginator(context, request, adjacent_pages=2):
end_page = paginator.num_pages + 1
# Generate a list of pages to include in the paginator template
page_numbers = [n for n in range(start_page, end_page) if n > 0 and n <= paginator.num_pages]
page_numbers = [n for n in range(start_page, end_page) if 0 < n <= paginator.num_pages]
return {
'page_obj': page_obj,

22
network/base/tests.py
View File

@ -1,3 +1,5 @@
from builtins import range
import random
from datetime import datetime, timedelta
@ -164,7 +166,7 @@ class StationListViewTest(TestCase):
stations = []
def setUp(self):
for _ in xrange(1, 10):
for _ in range(1, 10):
self.stations.append(StationFactory())
def test_station_list(self):
@ -195,19 +197,19 @@ class ObservationsListViewTest(TestCase):
self.observations_unvetted = []
self.observations = []
with transaction.atomic():
for _ in xrange(1, 10):
for _ in range(1, 10):
self.satellites.append(SatelliteFactory())
for _ in xrange(1, 10):
for _ in range(1, 10):
self.stations.append(StationFactory())
for _ in xrange(1, 5):
for _ in range(1, 5):
obs = ObservationFactory(vetted_status='bad')
self.observations_bad.append(obs)
self.observations.append(obs)
for _ in xrange(1, 5):
for _ in range(1, 5):
obs = ObservationFactory(vetted_status='good')
self.observations_good.append(obs)
self.observations.append(obs)
for _ in xrange(1, 5):
for _ in range(1, 5):
obs = ObservationFactory(vetted_status='unknown')
self.observations_unvetted.append(obs)
self.observations.append(obs)
@ -273,9 +275,9 @@ class ObservationViewTest(TestCase):
self.user = UserFactory()
moderators = Group.objects.get(name='Moderators')
moderators.user_set.add(self.user)
for _ in xrange(1, 10):
for _ in range(1, 10):
self.satellites.append(SatelliteFactory())
for _ in xrange(1, 10):
for _ in range(1, 10):
self.stations.append(StationFactory())
self.observation = ObservationFactory()
@ -299,7 +301,7 @@ class ObservationDeleteTest(TestCase):
def setUp(self):
self.user = UserFactory()
self.client.force_login(self.user)
for _ in xrange(1, 10):
for _ in range(1, 10):
self.satellites.append(SatelliteFactory())
self.future_observation = ObservationFactory()
self.future_observation.author = self.user
@ -422,7 +424,7 @@ class ObservationModelTest(TestCase):
admin = None
def setUp(self):
for _ in xrange(1, 10):
for _ in range(1, 10):
self.satellites.append(SatelliteFactory())
self.observation = ObservationFactory()
self.observation.end = now()

9
network/base/validators.py
View File

@ -78,11 +78,10 @@ def check_transmitter_station_pairs(transmitter_station_list):
'Transmitter out of station frequency range.'
' Transmitter-Station pair: {0}'.format(out_of_range_pairs[0])
)
else:
raise OutOfRangeError(
'Transmitter out of station frequency range. '
'Transmitter-Station pairs: {0}'.format(out_of_range_pairs)
)
raise OutOfRangeError(
'Transmitter out of station frequency range. '
'Transmitter-Station pairs: {0}'.format(out_of_range_pairs)
)
def check_overlaps(stations_dict):

59
network/base/views.py
View File

@ -372,8 +372,7 @@ def prediction_windows(request):
if not transmitter:
data = [{'error': 'You should select a valid Transmitter.'}]
return JsonResponse(data, safe=False)
else:
downlink = transmitter[0]['downlink_low']
downlink = transmitter[0]['downlink_low']
except DBConnectionError as error:
data = [{'error': error.message}]
return JsonResponse(data, safe=False)
@ -639,20 +638,18 @@ def scheduling_stations(request):
if uuid is None:
data = [{'error': 'You should select a Transmitter.'}]
return JsonResponse(data, safe=False)
else:
try:
transmitter = get_transmitter_by_uuid(uuid)
if not transmitter:
data = [{'error': 'You should select a valid Transmitter.'}]
return JsonResponse(data, safe=False)
else:
downlink = transmitter[0]['downlink_low']
if downlink is None:
data = [{'error': 'You should select a valid Transmitter.'}]
return JsonResponse(data, safe=False)
except DBConnectionError as error:
data = [{'error': error.message}]
try:
transmitter = get_transmitter_by_uuid(uuid)
if not transmitter:
data = [{'error': 'You should select a valid Transmitter.'}]
return JsonResponse(data, safe=False)
downlink = transmitter[0]['downlink_low']
if downlink is None:
data = [{'error': 'You should select a valid Transmitter.'}]
return JsonResponse(data, safe=False)
except DBConnectionError as error:
data = [{'error': error.message}]
return JsonResponse(data, safe=False)
stations = Station.objects.filter(status__gt=0)
available_stations = get_available_stations(stations, downlink, request.user)
@ -791,23 +788,10 @@ def station_edit(request, station_id=None):
form.save_m2m()
messages.success(request, 'Ground Station saved successfully.')
return redirect(reverse('base:station_view', kwargs={'station_id': station_form.id}))
else:
messages.error(
request, ('Your Ground Station submission has some '
'errors. {0}').format(form.errors)
)
return render(
request, 'base/station_edit.html', {
'form': form,
'station': station,
'antennas': antennas
}
)
else:
if station:
form = StationForm(instance=station)
else:
form = StationForm()
messages.error(
request, ('Your Ground Station submission has some '
'errors. {0}').format(form.errors)
)
return render(
request, 'base/station_edit.html', {
'form': form,
@ -815,6 +799,17 @@ def station_edit(request, station_id=None):
'antennas': antennas
}
)
if station:
form = StationForm(instance=station)
else:
form = StationForm()
return render(
request, 'base/station_edit.html', {
'form': form,
'station': station,
'antennas': antennas
}
)
@login_required