black and isort lint.

instances/apps.py

@@ -25,8 +25,8 @@ def apply_passwordless_console(sender, **kwargs):
     '''
     Apply new passwordless_console permission for all users
     '''
-    from django.contrib.auth.models import Permission
     from django.contrib.auth import get_user_model
+    from django.contrib.auth.models import Permission
     User = get_user_model()
     plan = kwargs.get('plan', [])
     for migration, rolled_back in plan:

instances/migrations/0001_initial.py

@@ -1,7 +1,6 @@
 # Generated by Django 2.2.10 on 2020-01-28 07:01
-
-from django.db import migrations, models
 import django.db.models.deletion
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

instances/migrations/0006_addFlavors.py

@@ -32,4 +32,5 @@ class Migration(migrations.Migration):
 
     operations = [
         migrations.RunPython(add_flavors, del_flavors),
-    ]
+    ]
+    

instances/templatetags/tags_active.py

@@ -1,6 +1,7 @@
-from django import template
 import re
 
+from django import template
+
 register = template.Library()
 
 

instances/tests.py

@@ -8,12 +8,11 @@ from django.contrib.auth.models import Permission
 from django.http.response import Http404
 from django.shortcuts import reverse
 from django.test import TestCase
+from instances.views import instance
 from libvirt import VIR_DOMAIN_UNDEFINE_NVRAM
 from vrtManager.create import wvmCreate
 from vrtManager.util import randomUUID
 
-from instances.views import instance
-
 from .models import Flavor, Instance
 from .utils import refr
 

instances/views.py

@@ -19,6 +19,7 @@ from django.http import Http404, HttpResponse, JsonResponse
 from django.shortcuts import get_object_or_404, redirect, render
 from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
+from instances.models import Instance
 from libvirt import VIR_DOMAIN_UNDEFINE_KEEP_NVRAM, VIR_DOMAIN_UNDEFINE_NVRAM, libvirtError
 from logs.views import addlogmsg
 from vrtManager import util
@@ -27,8 +28,6 @@ from vrtManager.instance import wvmInstances
 from vrtManager.storage import wvmStorage
 from vrtManager.util import randomPasswd
 
-from instances.models import Instance
-
 from . import utils
 from .forms import ConsoleForm, FlavorForm, NewVMForm
 from .models import Flavor
@@ -438,7 +437,7 @@ def resizevm_cpu(request, pk):
                 cur_vcpu = new_cur_vcpu
                 vcpu = new_vcpu
                 instance.proxy.resize_cpu(cur_vcpu, vcpu)
-                msg = _("CPU is resized:  %(old)s to %(new)s") % {"old": cur_vcpu,"new": vcpu}
+                msg = _("CPU is resized:  %(old)s to %(new)s") % {"old": cur_vcpu, "new": vcpu}
                 addlogmsg(request.user.username, instance.name, msg)
                 messages.success(request, msg)
     return redirect(reverse("instances:instance", args=[instance.id]) + "#resize")
@@ -951,7 +950,7 @@ def change_network(request, pk):
 @superuser_only
 def add_network(request, pk):
     instance = get_instance(request.user, pk)
-    
+
     mac = request.POST.get("add-net-mac")
     nwfilter = request.POST.get("add-net-nwfilter")
     (source, source_type) = utils.get_network_tuple(request.POST.get("add-net-network"))
@@ -1181,8 +1180,8 @@ def update_console(request, pk):
                     instance.proxy.set_console_keymap("")
                 else:
                     instance.proxy.set_console_keymap(form.cleaned_data["keymap"])
-                msg = _("Set VNC keymap")
-                
+
+                msg = _("Set VNC keymap")            
                 addlogmsg(request.user.username, instance.name, msg)
 
             if "type" in form.changed_data:
@@ -1287,7 +1286,7 @@ def create_instance_select_type(request, compute_id):
             xml = request.POST.get("dom_xml", "")
             try:
                 name = util.get_xml_path(xml, "/domain/name")
-            except util.etree.Error as err:
+            except util.etree.Error:
                 name = None
             if name in instances:
                 error_msg = _("A virtual machine with this name already exists")