sort imports (isort)

example/example/auth.py

@@ -1,8 +1,9 @@
-from django.shortcuts import render
-from django.http import HttpResponseRedirect
-from django.urls import reverse
 from django.contrib.auth import authenticate, login, logout
 from django.contrib.auth.models import User
+from django.http import HttpResponseRedirect
+from django.shortcuts import render
+from django.urls import reverse
+
 from mfa.helpers import has_mfa
 
 

example/example/urls.py

@@ -14,8 +14,9 @@ Including another URLconf
     2. Add a URL to urlpatterns:  path('blog/', include('blog.urls'))
 """
 from django.contrib import admin
-from django.urls import path, re_path, include
+from django.urls import include, path, re_path
-from . import views, auth
+
+from . import auth, views
 
 urlpatterns = [
     path("admin/", admin.site.urls),

mfa/Email.py

@@ -1,21 +1,22 @@
+import datetime
+import random
+from random import randint
+
 from django.contrib.auth import get_user_model
 from django.http import HttpResponseRedirect
 from django.shortcuts import render
-from django.views.decorators.cache import never_cache
 from django.template.context_processors import csrf
 from django.utils import timezone
+from django.views.decorators.cache import never_cache
 
 try:
     from django.core.urlresolvers import reverse
 except:
     from django.urls import reverse
 
-import datetime, random
-from random import randint
-from .models import *
-
-from .views import login
 from .Common import send
+from .models import *
+from .views import login
 
 
 def sendEmail(request, username, secret):

mfa/FIDO2.py

@@ -1,25 +1,24 @@
+import datetime
 import random
 import time
 import traceback
 
-from fido2.client import ClientData
-from fido2.server import Fido2Server, PublicKeyCredentialRpEntity
-from fido2.ctap2 import AttestationObject, AuthenticatorData
-from django.template.context_processors import csrf
-from django.views.decorators.csrf import csrf_exempt
-from django.shortcuts import render
-
 import simplejson
-from fido2 import cbor
-from django.http import HttpResponse
 from django.conf import settings
-from .models import *
+from django.http import HttpResponse
-from fido2.utils import websafe_decode, websafe_encode
+from django.shortcuts import render
-from fido2.ctap2 import AttestedCredentialData
+from django.template.context_processors import csrf
-from .views import login, reset_cookie
-import datetime
-from .Common import get_redirect_url
 from django.utils import timezone
+from django.views.decorators.csrf import csrf_exempt
+from fido2 import cbor
+from fido2.client import ClientData
+from fido2.ctap2 import AttestationObject, AttestedCredentialData, AuthenticatorData
+from fido2.server import Fido2Server, PublicKeyCredentialRpEntity
+from fido2.utils import websafe_decode, websafe_encode
+
+from .Common import get_redirect_url
+from .models import *
+from .views import login, reset_cookie
 
 
 def recheck(request):

mfa/TrustedDevice.py

@@ -1,16 +1,17 @@
-import string
 import random
+import string
 from datetime import datetime, timedelta
-from django.shortcuts import render
+
+import user_agents
 from django.http import HttpResponse
+from django.shortcuts import render
 from django.template.context import RequestContext
 from django.template.context_processors import csrf
-from .models import *
-import user_agents
 from django.utils import timezone
 from jose import jwt
 
 from .Common import send
+from .models import *
 
 
 def id_generator(size=6, chars=string.ascii_uppercase + string.digits):

mfa/U2F.py

@@ -1,26 +1,26 @@
-import datetime, random
+import datetime
 import hashlib
+import random
 import time
 
-from u2flib_server.u2f import (
+import simplejson
-    begin_registration,
-    begin_authentication,
-    complete_registration,
-    complete_authentication,
-)
 from cryptography import x509
 from cryptography.hazmat.backends import default_backend
 from cryptography.hazmat.primitives.serialization import Encoding
-from django.shortcuts import render
-import simplejson
-
-from django.template.context_processors import csrf
 from django.conf import settings
 from django.http import HttpResponse
+from django.shortcuts import render
+from django.template.context_processors import csrf
+from django.utils import timezone
+from u2flib_server.u2f import (
+    begin_authentication,
+    begin_registration,
+    complete_authentication,
+    complete_registration,
+)
+
 from .models import *
 from .views import login
-import datetime
-from django.utils import timezone
 
 
 def recheck(request):

mfa/helpers.py

@@ -1,9 +1,10 @@
 import pyotp
-from .models import *
-from . import TrustedDevice, U2F, FIDO2, totp
 import simplejson
 from django.shortcuts import HttpResponse
-from mfa.views import verify, goto
+
+from . import FIDO2, U2F, TrustedDevice, totp
+from .models import *
+from .views import goto, verify
 
 
 def has_mfa(request, username):

mfa/middleware.py

@@ -1,7 +1,8 @@
 import time
-from django.http import HttpResponseRedirect
+
-from django.core.urlresolvers import reverse
 from django.conf import settings
+from django.core.urlresolvers import reverse
+from django.http import HttpResponseRedirect
 
 
 def process(request):

mfa/models.py

@@ -1,7 +1,7 @@
-from django.db import models
-from jsonfield import JSONField
-from jose import jwt
 from django.conf import settings
+from django.db import models
+from jose import jwt
+from jsonfield import JSONField
 
 
 class User_Keys(models.Model):

mfa/totp.py

@@ -1,18 +1,19 @@
+import datetime
+import random
 import time
 
-from django.shortcuts import render
-from django.views.decorators.cache import never_cache
-from django.http import HttpResponse
-from .models import *
-from django.template.context_processors import csrf
-import simplejson
-from django.template.context import RequestContext
-from django.conf import settings
 import pyotp
-from .views import login
+import simplejson
-import datetime
+from django.conf import settings
+from django.http import HttpResponse
+from django.shortcuts import render
+from django.template.context import RequestContext
+from django.template.context_processors import csrf
 from django.utils import timezone
-import random
+from django.views.decorators.cache import never_cache
+
+from .models import *
+from .views import login
 
 
 def verify_login(request, username, token):

mfa/urls.py

@@ -1,10 +1,10 @@
-from . import views, totp, U2F, TrustedDevice, helpers, FIDO2, Email
-
 try:
     from django.urls import re_path as url
 except:
     from django.conf.urls import url
 
+from . import FIDO2, U2F, Email, TrustedDevice, helpers, totp, views
+
 urlpatterns = [
     url(r"totp/start/", totp.start, name="start_new_otop"),
     url(r"totp/getToken", totp.getToken, name="get_new_otop"),

mfa/views.py

@@ -2,20 +2,20 @@ import importlib
 
 from django.conf import settings
 from django.contrib import auth
-from django.shortcuts import render
+from django.contrib.auth.decorators import login_required
 from django.http import HttpResponse, HttpResponseRedirect
-from .models import *
+from django.shortcuts import render
+from django.template.context import RequestContext
+from django.template.context_processors import csrf
+from user_agents import parse
 
 try:
     from django.urls import reverse
 except:
     from django.core.urlresolvers import reverse
-from django.template.context_processors import csrf
+
-from django.template.context import RequestContext
-from django.conf import settings
 from . import TrustedDevice
-from django.contrib.auth.decorators import login_required
+from .models import *
-from user_agents import parse
 
 
 @login_required