Merge branch 'master' into 'master'

Fix a few more linting errors

See merge request librespacefoundation/satnogs/satnogs-network!774

.pylintrc

@@ -19,9 +19,7 @@ disable=
     R0913,
     R0914,
     R0915,
-    R1710,
     W0201,
-    W0221,
     W0223,
     W0612,
     W0613,

.pylintrc3

@@ -19,9 +19,7 @@ disable=
     R0913,
     R0914,
     R0915,
-    R1710,
     W0201,
-    W0221,
     W0223,
     W0612,
     W0613,

network/api/serializers.py

@@ -99,14 +99,14 @@ class ObservationSerializer(serializers.ModelSerializer):
 
 
 class NewObservationListSerializer(serializers.ListSerializer):
-    def validate(self, data):
+    def validate(self, attrs):
         user = self.context['request'].user
         station_list = []
         transmitter_uuid_list = []
         transmitter_uuid_station_list = []
         start_end_per_station = {}
 
-        for observation in data:
+        for observation in attrs:
             station = observation.get('ground_station')
             transmitter_uuid = observation.get('transmitter_uuid')
             start = observation.get('start')
@@ -148,7 +148,7 @@ class NewObservationListSerializer(serializers.ListSerializer):
             check_transmitter_station_pairs(transmitter_station_list)
         except OutOfRangeError as e:
             raise serializers.ValidationError(e, code='invalid')
-        return data
+        return attrs
 
     def create(self, validated_data):
         new_observations = []
@@ -222,14 +222,14 @@ class NewObservationSerializer(serializers.Serializer):
             raise serializers.ValidationError(e, code='invalid')
         return value
 
-    def validate(self, data):
-        start = data['start']
-        end = data['end']
+    def validate(self, attrs):
+        start = attrs['start']
+        end = attrs['end']
         try:
             check_start_end_datetimes(start, end)
         except ValueError as e:
             raise serializers.ValidationError(e, code='invalid')
-        return data
+        return attrs
 
     def create(self, validated_data):
         # If in the future we want to implement this serializer accepting and creating observation

network/users/admin.py

@@ -21,6 +21,7 @@ class HasStationListFilter(admin.SimpleListFilter):
             return queryset.annotate(count=Count('ground_stations')).filter(count__gt=0)
         if self.value() == '0':
             return queryset.annotate(count=Count('ground_stations')).filter(count__lt=1)
+        return None
 
 
 class UserAdmin(AuthUserAdmin):

network/users/views.py

@@ -15,7 +15,7 @@ from network.users.models import User
 class UserRedirectView(LoginRequiredMixin, RedirectView):
     permanent = False
 
-    def get_redirect_url(self):
+    def get_redirect_url(self, *args, **kwargs):
         return reverse("users:view_user", kwargs={"username": self.request.user.username})
 
 
@@ -28,7 +28,7 @@ class UserUpdateView(LoginRequiredMixin, UpdateView):
     def get_success_url(self):
         return reverse("users:view_user", kwargs={"username": self.request.user.username})
 
-    def get_object(self):
+    def get_object(self, queryset=None):
         return User.objects.get(username=self.request.user.username)