Format code imports

evennia/web/admin/__init__.py

@@ -7,9 +7,9 @@ Django-admin code for customizing the web admin for Evennia.
 # look for `admin` in the web/ folder.
 
 from .accounts import AccountAdmin
-from .objects import ObjectAdmin
-from .scripts import ScriptAdmin
 from .comms import ChannelAdmin, MsgAdmin
 from .help import HelpEntryAdmin
-from .tags import TagAdmin
+from .objects import ObjectAdmin
+from .scripts import ScriptAdmin
 from .server import ServerConfigAdmin
+from .tags import TagAdmin

evennia/web/admin/accounts.py

@@ -3,30 +3,31 @@
 # in the web admin interface.
 #
 from django import forms
-from django.utils.safestring import mark_safe
 from django.conf import settings
 from django.contrib import admin, messages
 from django.contrib.admin.options import IS_POPUP_VAR
-from django.contrib.admin.widgets import ForeignKeyRawIdWidget, FilteredSelectMultiple
-from django.contrib.auth.admin import UserAdmin as BaseUserAdmin
-from django.utils.translation import gettext as _
-from django.contrib.auth.forms import UserChangeForm, UserCreationForm
 from django.contrib.admin.utils import unquote
-from django.template.response import TemplateResponse
-from django.http import Http404, HttpResponseRedirect
+from django.contrib.admin.widgets import FilteredSelectMultiple, ForeignKeyRawIdWidget
+from django.contrib.auth import update_session_auth_hash
+from django.contrib.auth.admin import UserAdmin as BaseUserAdmin
+from django.contrib.auth.forms import UserChangeForm, UserCreationForm
 from django.core.exceptions import PermissionDenied
-from django.views.decorators.debug import sensitive_post_parameters
+from django.http import Http404, HttpResponseRedirect
+from django.template.response import TemplateResponse
+from django.urls import path, reverse
 from django.utils.decorators import method_decorator
 from django.utils.html import escape
-from django.urls import path, reverse
-from django.contrib.auth import update_session_auth_hash
+from django.utils.safestring import mark_safe
+from django.utils.translation import gettext as _
+from django.views.decorators.debug import sensitive_post_parameters
 
-from evennia.objects.models import ObjectDB
 from evennia.accounts.models import AccountDB
+from evennia.objects.models import ObjectDB
 from evennia.utils import create
+
+from . import utils as adminutils
 from .attributes import AttributeInline
 from .tags import TagInline
-from . import utils as adminutils
 
 sensitive_post_parameters_m = method_decorator(sensitive_post_parameters())
 

evennia/web/admin/attributes.py

@@ -8,12 +8,13 @@ relevant together with a specific object.
 
 import traceback
 from datetime import datetime
-from django.contrib import admin
-from evennia.typeclasses.attributes import Attribute
-from django import forms
 
+from django import forms
+from django.contrib import admin
+
+from evennia.typeclasses.attributes import Attribute
+from evennia.utils.dbserialize import _SaverSet, from_pickle
 from evennia.utils.picklefield import PickledFormField
-from evennia.utils.dbserialize import from_pickle, _SaverSet
 
 
 class AttributeForm(forms.ModelForm):

evennia/web/admin/comms.py

@@ -4,9 +4,10 @@ This defines how Comm models are displayed in the web admin interface.
 """
 
 from django import forms
-from django.contrib import admin
-from evennia.comms.models import ChannelDB, Msg
 from django.conf import settings
+from django.contrib import admin
+
+from evennia.comms.models import ChannelDB, Msg
 
 from .attributes import AttributeInline
 from .tags import TagInline

evennia/web/admin/frontpage.py

@@ -4,8 +4,8 @@ Admin views.
 """
 
 from django.contrib.admin.sites import site
-from django.shortcuts import render
 from django.contrib.admin.views.decorators import staff_member_required
+from django.shortcuts import render
 
 from evennia.accounts.models import AccountDB
 

evennia/web/admin/help.py

@@ -3,6 +3,7 @@ This defines how to edit help entries in Admin.
 """
 from django import forms
 from django.contrib import admin
+
 from evennia.help.models import HelpEntry
 
 from .tags import TagInline

evennia/web/admin/objects.py

@@ -2,22 +2,22 @@
 # This sets up how models are displayed
 # in the web admin interface.
 #
-from django.conf import settings
 from django import forms
-from django.urls import reverse, path
-from django.http import HttpResponseRedirect
 from django.conf import settings
 from django.contrib import admin, messages
 from django.contrib.admin.utils import flatten_fieldsets
 from django.contrib.admin.widgets import ForeignKeyRawIdWidget
+from django.http import HttpResponseRedirect
+from django.urls import path, reverse
 from django.utils.html import format_html
 from django.utils.translation import gettext as _
 
-from evennia.objects.models import ObjectDB
 from evennia.accounts.models import AccountDB
+from evennia.objects.models import ObjectDB
+
+from . import utils as adminutils
 from .attributes import AttributeInline
 from .tags import TagInline
-from . import utils as adminutils
 
 
 class ObjectAttributeInline(AttributeInline):

evennia/web/admin/scripts.py

@@ -7,9 +7,10 @@ from django.conf import settings
 from django.contrib import admin
 
 from evennia.scripts.models import ScriptDB
+
+from . import utils as adminutils
 from .attributes import AttributeInline
 from .tags import TagInline
-from . import utils as adminutils
 
 
 class ScriptForm(forms.ModelForm):

evennia/web/admin/server.py

@@ -6,6 +6,7 @@ in the web admin interface.
 """
 
 from django.contrib import admin
+
 from evennia.server.models import ServerConfig
 
 

evennia/web/admin/tags.py

@@ -6,12 +6,13 @@ Tag admin
 
 import traceback
 from datetime import datetime
-from django.contrib import admin
-from evennia.typeclasses.tags import Tag
-from django import forms
 
+from django import forms
+from django.contrib import admin
+
+from evennia.typeclasses.tags import Tag
+from evennia.utils.dbserialize import _SaverSet, from_pickle
 from evennia.utils.picklefield import PickledFormField
-from evennia.utils.dbserialize import from_pickle, _SaverSet
 
 
 class TagForm(forms.ModelForm):

evennia/web/admin/urls.py

@@ -6,9 +6,9 @@ These patterns are all under the admin/* namespace.
 """
 from django.conf import settings
 from django.contrib import admin
-from django.urls import path, include
-from . import frontpage
+from django.urls import include, path
 
+from . import frontpage
 
 urlpatterns = [
     # Django original admin page. Make this URL always available, whether

evennia/web/admin/utils.py

@@ -4,7 +4,8 @@ Helper utils for admin views.
 """
 
 import importlib
-from evennia.utils.utils import get_all_typeclasses, inherits_from, get_all_cmdsets
+
+from evennia.utils.utils import get_all_cmdsets, get_all_typeclasses, inherits_from
 
 
 def get_and_load_typeclasses(parent=None, excluded_parents=None):

evennia/web/api/filters.py

@@ -8,12 +8,13 @@ https://django-filter.readthedocs.io/en/latest/guide/rest_framework.html
 
 """
 from typing import Union
-from django.db.models import Q
-from django_filters.rest_framework.filterset import FilterSet
-from django_filters.filters import CharFilter, EMPTY_VALUES
 
-from evennia.objects.models import ObjectDB
+from django.db.models import Q
+from django_filters.filters import EMPTY_VALUES, CharFilter
+from django_filters.rest_framework.filterset import FilterSet
+
 from evennia.accounts.models import AccountDB
+from evennia.objects.models import ObjectDB
 from evennia.scripts.models import ScriptDB
 
 

evennia/web/api/permissions.py

@@ -4,8 +4,9 @@ Sets up an api-access permission check using the in-game permission hierarchy.
 """
 
 
-from rest_framework import permissions
 from django.conf import settings
+from rest_framework import permissions
+
 from evennia.locks.lockhandler import check_perm
 
 

evennia/web/api/serializers.py

@@ -12,12 +12,12 @@ often django model instances, that we can use (deserialization).
 
 from rest_framework import serializers
 
-from evennia.objects.objects import DefaultObject
 from evennia.accounts.accounts import DefaultAccount
+from evennia.help.models import HelpEntry
+from evennia.objects.objects import DefaultObject
 from evennia.scripts.models import ScriptDB
 from evennia.typeclasses.attributes import Attribute
 from evennia.typeclasses.tags import Tag
-from evennia.help.models import HelpEntry
 
 
 class AttributeSerializer(serializers.ModelSerializer):

evennia/web/api/tests.py

@@ -2,13 +2,15 @@
 Tests for the REST API.
 
 """
+from collections import namedtuple
+
+from django.core.exceptions import ObjectDoesNotExist
+from django.test import override_settings
+from django.urls import include, path, reverse
+from rest_framework.test import APIClient
+
 from evennia.utils.test_resources import BaseEvenniaTest
 from evennia.web.api import serializers
-from rest_framework.test import APIClient
-from django.urls import reverse, path, include
-from django.test import override_settings
-from collections import namedtuple
-from django.core.exceptions import ObjectDoesNotExist
 
 urlpatterns = [
     path(r"^", include("evennia.web.website.urls")),

evennia/web/api/urls.py

@@ -21,8 +21,8 @@ from django.urls import path
 from django.views.generic import TemplateView
 from rest_framework.schemas import get_schema_view
 
-from evennia.web.api.root import APIRootRouter
 from evennia.web.api import views
+from evennia.web.api.root import APIRootRouter
 
 app_name = "api"
 

evennia/web/api/views.py

@@ -4,20 +4,18 @@ Rest Framework provides collections called 'ViewSets', which can generate a
 number of views for the common CRUD operations.
 
 """
-from rest_framework.viewsets import ModelViewSet
+from django_filters.rest_framework import DjangoFilterBackend
+from rest_framework import status
 from rest_framework.decorators import action
 from rest_framework.response import Response
-from rest_framework import status
-
-from django_filters.rest_framework import DjangoFilterBackend
+from rest_framework.viewsets import ModelViewSet
 
+from evennia.accounts.models import AccountDB
+from evennia.help.models import HelpEntry
 from evennia.objects.models import ObjectDB
 from evennia.objects.objects import DefaultCharacter, DefaultExit, DefaultRoom
-from evennia.accounts.models import AccountDB
 from evennia.scripts.models import ScriptDB
-from evennia.help.models import HelpEntry
-from evennia.web.api import serializers
-from evennia.web.api import filters
+from evennia.web.api import filters, serializers
 from evennia.web.api.permissions import EvenniaPermission
 
 

evennia/web/urls.py

@@ -17,7 +17,7 @@ This is the starting point when a user enters an URL.
 """
 
 from django.conf import settings
-from django.urls import path, include
+from django.urls import include, path
 from django.views.generic import RedirectView
 
 # Setup the root url tree from /

evennia/web/utils/adminsite.py

@@ -8,8 +8,8 @@ of that folder for Django to find them).
 
 """
 
-from django.contrib.admin import apps
 from django.contrib import admin
+from django.contrib.admin import apps
 
 
 class EvenniaAdminApp(apps.AdminConfig):

evennia/web/utils/backends.py

@@ -1,5 +1,5 @@
-from django.contrib.auth.backends import ModelBackend
 from django.contrib.auth import get_user_model
+from django.contrib.auth.backends import ModelBackend
 
 
 class CaseInsensitiveModelBackend(ModelBackend):

evennia/web/utils/general_context.py

@@ -9,7 +9,9 @@ TEMPLATES["OPTIONS"]["context_processors"] list.
 
 
 import os
+
 from django.conf import settings
+
 from evennia.utils.utils import get_evennia_version
 
 # Setup lists of the most relevant apps so

evennia/web/utils/middleware.py

@@ -1,4 +1,5 @@
 from django.contrib.auth import authenticate, login
+
 from evennia.accounts.models import AccountDB
 from evennia.utils import logger
 

evennia/web/utils/tests.py

@@ -1,6 +1,7 @@
 from django.contrib.auth.models import AnonymousUser
 from django.test import RequestFactory, TestCase
 from mock import MagicMock, patch
+
 from . import general_context
 
 

evennia/web/webclient/urls.py

@@ -3,6 +3,7 @@ This structures the (simple) structure of the webpage 'application'.
 
 """
 from django.urls import path
+
 from . import views
 
 app_name = "webclient"

evennia/web/webclient/views.py

@@ -5,9 +5,9 @@ page and serve it eventual static content.
 """
 
 from django.conf import settings
+from django.contrib.auth import authenticate, login
 from django.http import Http404
 from django.shortcuts import render
-from django.contrib.auth import login, authenticate
 
 from evennia.accounts.models import AccountDB
 from evennia.utils import logger

evennia/web/website/forms.py

@@ -3,6 +3,7 @@ from django.conf import settings
 from django.contrib.auth.forms import UserCreationForm, UsernameField
 from django.forms import ModelForm
 from django.utils.html import escape
+
 from evennia.utils import class_from_module
 
 

evennia/web/website/tests.py

@@ -2,6 +2,7 @@ from django.conf import settings
 from django.test import Client, override_settings
 from django.urls import reverse
 from django.utils.text import slugify
+
 from evennia.help import filehelp
 from evennia.utils import class_from_module
 from evennia.utils.create import create_help_entry

evennia/web/website/urls.py

@@ -4,9 +4,11 @@ This redirects to website sub-pages.
 """
 from django.conf import settings
 from django.contrib import admin
-from django.urls import path, include
-from .views import index, errors, accounts, help as helpviews, channels, characters
+from django.urls import include, path
 
+from .views import accounts, channels, characters, errors
+from .views import help as helpviews
+from .views import index
 
 urlpatterns = [
     # website front page

evennia/web/website/views/accounts.py

@@ -4,14 +4,15 @@ Views for managing accounts.
 """
 
 
-from evennia.utils import class_from_module
 from django.conf import settings
 from django.contrib import messages
-from django.urls import reverse_lazy
 from django.http import HttpResponseRedirect
+from django.urls import reverse_lazy
+
+from evennia.utils import class_from_module
+from evennia.web.website import forms
 
 from .mixins import EvenniaCreateView, TypeclassMixin
-from evennia.web.website import forms
 
 
 class AccountMixin(TypeclassMixin):

evennia/web/website/views/channels.py

@@ -4,13 +4,14 @@ Views for managing channels.
 """
 
 from django.conf import settings
-from django.views.generic import ListView
-from django.utils.text import slugify
 from django.db.models.functions import Lower
 from django.http import HttpResponseBadRequest
+from django.utils.text import slugify
+from django.views.generic import ListView
 
-from evennia.utils.logger import tail_log_file
 from evennia.utils import class_from_module
+from evennia.utils.logger import tail_log_file
+
 from .mixins import TypeclassMixin
 from .objects import ObjectDetailView
 

evennia/web/website/views/characters.py

@@ -5,18 +5,20 @@ puppeting).
 """
 
 from django.conf import settings
-from django.urls import reverse_lazy
 from django.contrib import messages
 from django.contrib.auth.mixins import LoginRequiredMixin
-from django.http import HttpResponseRedirect
 from django.db.models.functions import Lower
-from django.views.generic.base import RedirectView
+from django.http import HttpResponseRedirect
+from django.urls import reverse_lazy
 from django.views.generic import ListView
+from django.views.generic.base import RedirectView
+
 from evennia.utils import class_from_module
-from .mixins import TypeclassMixin
-from .objects import ObjectDetailView, ObjectDeleteView, ObjectUpdateView, ObjectCreateView
 from evennia.web.website import forms
 
+from .mixins import TypeclassMixin
+from .objects import ObjectCreateView, ObjectDeleteView, ObjectDetailView, ObjectUpdateView
+
 
 class CharacterMixin(TypeclassMixin):
     """

evennia/web/website/views/help.py

@@ -4,14 +4,15 @@ Views to manipulate help entries.
 Multi entry object type supported added by DaveWithTheNiceHat 2021
     Pull Request #2429
 """
-from django.utils.text import slugify
 from django.conf import settings
-from evennia.utils.utils import inherits_from
-from django.views.generic import ListView, DetailView
 from django.http import HttpResponseBadRequest
-from evennia.help.models import HelpEntry
+from django.utils.text import slugify
+from django.views.generic import DetailView, ListView
+
 from evennia.help.filehelp import FILE_HELP_ENTRIES
+from evennia.help.models import HelpEntry
 from evennia.utils.ansi import strip_ansi
+from evennia.utils.utils import inherits_from
 
 DEFAULT_HELP_CATEGORY = settings.DEFAULT_HELP_CATEGORY
 

evennia/web/website/views/index.py

@@ -5,9 +5,10 @@ The main index page, including the game stats
 
 from django.conf import settings
 from django.views.generic import TemplateView
+
 from evennia import SESSION_HANDLER
-from evennia.objects.models import ObjectDB
 from evennia.accounts.models import AccountDB
+from evennia.objects.models import ObjectDB
 from evennia.utils import class_from_module
 
 

evennia/web/website/views/mixins.py

@@ -3,7 +3,7 @@ These are mixins for class-based views, granting functionality.
 
 """
 from django.views.generic import DetailView
-from django.views.generic.edit import CreateView, UpdateView, DeleteView
+from django.views.generic.edit import CreateView, DeleteView, UpdateView
 
 
 class TypeclassMixin:

evennia/web/website/views/objects.py

@@ -4,14 +4,17 @@ Views for managing a specific object)
 """
 
 from collections import OrderedDict
+
 from django.conf import settings
-from django.contrib.auth.mixins import LoginRequiredMixin
-from django.http import HttpResponseBadRequest, HttpResponseRedirect
-from django.core.exceptions import PermissionDenied
 from django.contrib import messages
-from evennia.utils import class_from_module
+from django.contrib.auth.mixins import LoginRequiredMixin
+from django.core.exceptions import PermissionDenied
+from django.http import HttpResponseBadRequest, HttpResponseRedirect
 from django.utils.text import slugify
-from .mixins import EvenniaCreateView, EvenniaDeleteView, EvenniaUpdateView, EvenniaDetailView
+
+from evennia.utils import class_from_module
+
+from .mixins import EvenniaCreateView, EvenniaDeleteView, EvenniaDetailView, EvenniaUpdateView
 
 
 class ObjectDetailView(EvenniaDetailView):