From 30760654b7a3d7a394028fdf357d6f257def1fd5 Mon Sep 17 00:00:00 2001 From: Philip Sargent Date: Sun, 15 Dec 2024 18:54:47 +0000 Subject: import order fixed by ruff --- core/views/caves.py | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) (limited to 'core/views/caves.py') diff --git a/core/views/caves.py b/core/views/caves.py index 56f0d36..70a7a84 100644 --- a/core/views/caves.py +++ b/core/views/caves.py @@ -1,32 +1,29 @@ import os import re -import django import subprocess import tempfile -import zipfile import urllib -from bs4 import BeautifulSoup - +import zipfile from pathlib import Path +import django +from bs4 import BeautifulSoup from django.core.exceptions import MultipleObjectsReturned, ObjectDoesNotExist -from django.http import HttpResponse, HttpResponseNotFound, HttpResponseRedirect, FileResponse -from django.shortcuts import render, redirect +from django.http import FileResponse, HttpResponse, HttpResponseNotFound, HttpResponseRedirect +from django.shortcuts import redirect, render +from django.template import loader from django.urls import NoReverseMatch, reverse +from django.utils.safestring import mark_safe import troggle.settings as settings -from troggle.core.forms import CaveForm, EntranceForm, EntranceLetterForm # CaveAndEntranceFormSet, +from troggle.core.forms import CaveForm, EntranceForm, EntranceLetterForm # CaveAndEntranceFormSet, from troggle.core.models.caves import Cave, CaveAndEntrance, Entrance, GetCaveLookup, get_cave_leniently from troggle.core.models.logbooks import QM from troggle.core.models.wallets import Wallet -from troggle.core.utils import write_and_commit -from troggle.core.utils import current_expo +from troggle.core.utils import current_expo, write_and_commit from troggle.core.views import expo -from troggle.settings import CAVEDESCRIPTIONS, ENTRANCEDESCRIPTIONS from troggle.parsers.caves import read_cave, read_entrance - -from django.template import loader -from django.utils.safestring import mark_safe +from troggle.settings import CAVEDESCRIPTIONS, ENTRANCEDESCRIPTIONS from .auth import login_required_if_public -- cgit v1.2.3