[qa] Reformatted code with black

Author: atb00ker

.travis.yml

@@ -26,8 +26,8 @@ install:
 
 before_script:
   - |
-    openwisp-utils-qa-checks --migration-path "./django_netjsongraph/migrations" \
-                             --migration-module django_netjsongraph
+    openwisp-qa-check --migration-path "./django_netjsongraph/migrations" \
+                      --migration-module django_netjsongraph
 
 script:
   - coverage run --source=django_netjsongraph runtests.py

django_netjsongraph/admin.py

@@ -1,7 +1,6 @@
 from django.contrib import admin
 
-from .base.admin import (AbstractLinkAdmin, AbstractNodeAdmin,
-                         AbstractTopologyAdmin)
+from .base.admin import AbstractLinkAdmin, AbstractNodeAdmin, AbstractTopologyAdmin
 from .models import Link, Node, Topology
 
 

django_netjsongraph/api/generics.py

@@ -17,6 +17,7 @@ class BaseNetworkCollectionView(generics.ListAPIView):
     Data of all the topologies returned
     in NetJSON NetworkCollection format
     """
+
     serializer_class = NetworkGraphSerializer
 
 
@@ -25,6 +26,7 @@ class BaseNetworkGraphView(generics.RetrieveAPIView):
     Data of a specific topology returned
     in NetJSON NetworkGraph format
     """
+
     serializer_class = NetworkGraphSerializer
 
 
@@ -40,17 +42,18 @@ def get(self, request, pk, format=None):
         options = dict(topology=topology, date=date)
         # missing date: 400
         if not date:
-            return Response({'detail': _('missing required "date" parameter')},
-                            status=400)
+            return Response(
+                {'detail': _('missing required "date" parameter')}, status=400
+            )
         try:
             s = self.snapshot_model.objects.get(**options)
             return Response(json.loads(s.data))
         except self.snapshot_model.DoesNotExist:
-            return Response({'detail': _('no snapshot found for this date')},
-                            status=404)
+            return Response(
+                {'detail': _('no snapshot found for this date')}, status=404
+            )
         except ValidationError:
-            return Response({'detail': _('invalid date supplied')},
-                            status=403)
+            return Response({'detail': _('invalid date supplied')}, status=403)
 
 
 class BaseReceiveTopologyView(APIView):
@@ -63,29 +66,32 @@ class BaseReceiveTopologyView(APIView):
     Allowed content-types:
         * text/plain
     """
+
     parser_classes = (TextParser,)
 
     def post(self, request, pk, format=None):
         topology = get_object_or_404(self.model, pk, strategy='receive')
         key = request.query_params.get('key')
         # wrong content type: 415
         if request.content_type != 'text/plain':
-            return Response({'detail': _('expected content type "text/plain"')},
-                            status=415)
+            return Response(
+                {'detail': _('expected content type "text/plain"')}, status=415
+            )
         # missing key: 400
         if not key:
-            return Response({'detail': _('missing required "key" parameter')},
-                            status=400)
+            return Response(
+                {'detail': _('missing required "key" parameter')}, status=400
+            )
         # wrong key 403
         if topology.key != key:
-            return Response({'detail': _('wrong key')},
-                            status=403)
+            return Response({'detail': _('wrong key')}, status=403)
         try:
             topology.receive(request.data)
         except NetdiffException as e:
-            error = _('Supplied data not recognized as %s, '
-                      'got exception of type "%s" '
-                      'with message "%s"') % (topology.get_parser_display(),
-                                              e.__class__.__name__, e)
+            error = _(
+                'Supplied data not recognized as %s, '
+                'got exception of type "%s" '
+                'with message "%s"'
+            ) % (topology.get_parser_display(), e.__class__.__name__, e)
             return Response({'detail': error}, status=400)
         return Response({'detail': _('data received successfully')})

django_netjsongraph/api/parsers.py

@@ -8,6 +8,7 @@ class TextParser(JSONParser):
     """
     Dummy TextParser accepting any text (used in ReceiveTopologyView)
     """
+
     media_type = 'text/plain'
 
     def parse(self, stream, media_type=None, parser_context=None):

django_netjsongraph/api/serializers.py

@@ -7,21 +7,25 @@ class NetworkCollectionSerializer(serializers.ListSerializer):
     """
     NetJSON NetworkCollection
     """
+
     @property
     def data(self):
         return super(serializers.ListSerializer, self).data
 
     def to_representation(self, data):
-        return OrderedDict((
-            ('type', 'NetworkCollection'),
-            ('collection', super().to_representation(data))
-        ))
+        return OrderedDict(
+            (
+                ('type', 'NetworkCollection'),
+                ('collection', super().to_representation(data)),
+            )
+        )
 
 
 class NetworkGraphSerializer(serializers.ModelSerializer):
     """
     NetJSON NetworkGraph
     """
+
     def to_representation(self, obj):
         return obj.json(dict=True)
 

django_netjsongraph/api/views.py

@@ -1,6 +1,10 @@
 from ..models import Snapshot, Topology
-from .generics import (BaseNetworkCollectionView, BaseNetworkGraphHistoryView,
-                       BaseNetworkGraphView, BaseReceiveTopologyView)
+from .generics import (
+    BaseNetworkCollectionView,
+    BaseNetworkGraphHistoryView,
+    BaseNetworkGraphView,
+    BaseReceiveTopologyView,
+)
 
 
 class NetworkCollectionView(BaseNetworkCollectionView):

django_netjsongraph/base/admin.py

@@ -6,6 +6,7 @@
 from django.templatetags.static import static
 from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
+
 from openwisp_utils.admin import ReceiveUrlAdmin
 
 from .. import settings as app_settings
@@ -17,25 +18,35 @@ class TimeStampedEditableAdmin(ModelAdmin):
     """
     ModelAdmin for TimeStampedEditableModel
     """
+
     def __init__(self, *args, **kwargs):
-        self.readonly_fields += ('created', 'modified',)
+        self.readonly_fields += (
+            'created',
+            'modified',
+        )
         super().__init__(*args, **kwargs)
 
 
 class BaseAdmin(TimeStampedEditableAdmin):
     save_on_top = True
 
     class Media:
-        css = {'all': [static('netjsongraph/css/src/netjsongraph.css'),
-                       static('netjsongraph/css/lib/jquery-ui.min.css'),
-                       static('netjsongraph/css/style.css'),
-                       static('netjsongraph/css/admin.css')]}
-        js = [static('netjsongraph/js/lib/d3.min.js'),
-              static('netjsongraph/js/lib/jquery-ui.min.js'),
-              static('netjsongraph/js/src/netjsongraph.js'),
-              static('netjsongraph/js/strategy-switcher.js'),
-              static('netjsongraph/js/topology-history.js'),
-              static('netjsongraph/js/visualize.js')]
+        css = {
+            'all': [
+                static('netjsongraph/css/src/netjsongraph.css'),
+                static('netjsongraph/css/lib/jquery-ui.min.css'),
+                static('netjsongraph/css/style.css'),
+                static('netjsongraph/css/admin.css'),
+            ]
+        }
+        js = [
+            static('netjsongraph/js/lib/d3.min.js'),
+            static('netjsongraph/js/lib/jquery-ui.min.js'),
+            static('netjsongraph/js/src/netjsongraph.js'),
+            static('netjsongraph/js/strategy-switcher.js'),
+            static('netjsongraph/js/topology-history.js'),
+            static('netjsongraph/js/visualize.js'),
+        ]
 
 
 class AbstractTopologyAdmin(BaseAdmin, ReceiveUrlAdmin, GraphVisualizerUrls):
@@ -44,9 +55,21 @@ class AbstractTopologyAdmin(BaseAdmin, ReceiveUrlAdmin, GraphVisualizerUrls):
     list_filter = ['parser', 'strategy']
     search_fields = ['label', 'id']
     actions = ['update_selected', 'unpublish_selected', 'publish_selected']
-    fields = ['label', 'parser', 'strategy', 'url', 'key',
-              'expiration_time', 'receive_url', 'published', 'protocol',
-              'version', 'revision', 'metric', 'created']
+    fields = [
+        'label',
+        'parser',
+        'strategy',
+        'url',
+        'key',
+        'expiration_time',
+        'receive_url',
+        'published',
+        'protocol',
+        'version',
+        'revision',
+        'metric',
+        'created',
+    ]
     receive_url_name = 'receive_topology'
     receive_url_urlconf = app_settings.TOPOLOGY_API_URLCONF
     receive_url_baseurl = app_settings.TOPOLOGY_API_BASEURL
@@ -63,35 +86,45 @@ def get_actions(self, request):
 
     def change_view(self, request, object_id, form_url='', extra_context=None):
         extra_context = extra_context or {}
-        prefix = 'admin:{0}_{1}'.format(self.opts.app_label, self.model.__name__.lower())
+        prefix = 'admin:{0}_{1}'.format(
+            self.opts.app_label, self.model.__name__.lower()
+        )
         text = _('View topology graph')
-        extra_context.update({
-            'additional_buttons': [
-                {
-                    'type': 'button',
-                    'url': reverse('{0}_visualize'.format(prefix), args=[object_id]),
-                    'class': 'visualizelink',
-                    'value': text,
-                    'title': '{0} (ALT+P)'.format(text)
-                }
-            ]
-        })
+        extra_context.update(
+            {
+                'additional_buttons': [
+                    {
+                        'type': 'button',
+                        'url': reverse(
+                            '{0}_visualize'.format(prefix), args=[object_id]
+                        ),
+                        'class': 'visualizelink',
+                        'value': text,
+                        'title': '{0} (ALT+P)'.format(text),
+                    }
+                ]
+            }
+        )
         return super().change_view(request, object_id, form_url, extra_context)
 
     def get_urls(self):
         options = getattr(self.model, '_meta')
         url_prefix = '{0}_{1}'.format(options.app_label, options.model_name)
         return [
-            url(r'^visualize/(?P<pk>[^/]+)/$',
+            url(
+                r'^visualize/(?P<pk>[^/]+)/$',
                 self.admin_site.admin_view(self.visualize_view),
-                name='{0}_visualize'.format(url_prefix)),
+                name='{0}_visualize'.format(url_prefix),
+            ),
         ] + super().get_urls()
 
     def _message(self, request, rows, suffix, level=messages.SUCCESS):
         if rows == 1:
             prefix = _('1 {0} was'.format(self.model._meta.verbose_name))
         else:  # pragma: nocover
-            prefix = _('{0} {1} were'.format(rows, self.model._meta.verbose_name_plural))
+            prefix = _(
+                '{0} {1} were'.format(rows, self.model._meta.verbose_name_plural)
+            )
         self.message_user(request, '{0} {1}'.format(prefix, suffix), level=level)
 
     def update_selected(self, request, queryset):
@@ -123,31 +156,40 @@ def update_selected(self, request, queryset):
         if total_ignored > 0:
             message = _("ignored (not using FETCH strategy)")
             self._message(request, total_ignored, message, level=messages.WARNING)
-    update_selected.short_description = _('Update selected topologies (FETCH strategy only)')
+
+    update_selected.short_description = _(
+        'Update selected topologies (FETCH strategy only)'
+    )
 
     def publish_selected(self, request, queryset):
         rows_updated = queryset.update(published=True)
         self._message(request, rows_updated, _('successfully published'))
+
     publish_selected.short_description = _('Publish selected topologies')
 
     def unpublish_selected(self, request, queryset):
         rows_updated = queryset.update(published=False)
         self._message(request, rows_updated, _('successfully unpublished'))
+
     unpublish_selected.short_description = _('Unpublish selected items')
 
     def visualize_view(self, request, pk):
         graph_url, history_url = self.get_graph_urls(request, pk)
         context = self.admin_site.each_context(request)
         opts = self.model._meta
-        context.update({
-            'is_popup': True,
-            'opts': opts,
-            'change': False,
-            'media': self.media,
-            'graph_url': graph_url,
-            'history_url': history_url
-        })
-        return TemplateResponse(request, 'admin/%s/visualize.html' % opts.app_label, context)
+        context.update(
+            {
+                'is_popup': True,
+                'opts': opts,
+                'change': False,
+                'media': self.media,
+                'graph_url': graph_url,
+                'history_url': history_url,
+            }
+        )
+        return TemplateResponse(
+            request, 'admin/%s/visualize.html' % opts.app_label, context
+        )
 
 
 class AbstractNodeAdmin(BaseAdmin):
@@ -159,16 +201,14 @@ def change_view(self, request, object_id, form_url='', extra_context=None):
         extra_context = extra_context or {}
         link_model = self.model.source_link_set.field.model
         admin_url = 'admin:{0}_link_change'.format(self.opts.app_label)
-        extra_context.update({
-            'node_links': link_model.objects.select_related('source', 'target')
-                                            .only('source__label',
-                                                  'target__label',
-                                                  'cost',
-                                                  'status')
-                                            .filter(Q(source_id=object_id) |
-                                                    Q(target_id=object_id)),
-            'admin_url': admin_url
-        })
+        extra_context.update(
+            {
+                'node_links': link_model.objects.select_related('source', 'target')
+                .only('source__label', 'target__label', 'cost', 'status')
+                .filter(Q(source_id=object_id) | Q(target_id=object_id)),
+                'admin_url': admin_url,
+            }
+        )
         return super().change_view(request, object_id, form_url, extra_context)