mirror of
https://github.com/Findus23/RPGnotes.git
synced 2024-09-18 14:33:44 +02:00
pyupgrade
This commit is contained in:
parent
2559e3ee47
commit
32de61ca07
16 changed files with 27 additions and 28 deletions
|
@ -57,7 +57,7 @@ class CampaignDetailView(generic.DetailView):
|
|||
return self.request.tenant
|
||||
|
||||
def get_context_data(self, **kwargs):
|
||||
context = super(CampaignDetailView, self).get_context_data(**kwargs)
|
||||
context = super().get_context_data(**kwargs)
|
||||
players = self.object.user_set.exclude(pk__in=[1, 2])
|
||||
|
||||
context["players"] = {}
|
||||
|
|
|
@ -12,7 +12,7 @@ class CharacterForm(ModelForm):
|
|||
"archived", "color", "token_image", "large_image"]
|
||||
|
||||
def __init__(self, *args, **kwargs):
|
||||
super(CharacterForm, self).__init__(*args, **kwargs)
|
||||
super().__init__(*args, **kwargs)
|
||||
self.fields['player'].queryset = TenantUser.objects \
|
||||
.filter(tenants=connection.get_tenant()) \
|
||||
.exclude(pk__in=[1, 2])
|
||||
|
|
|
@ -6,7 +6,6 @@ by Andrey Kolpakov
|
|||
but using pathlib and considering django-tenants
|
||||
"""
|
||||
from pathlib import Path
|
||||
from typing import Set
|
||||
|
||||
from django.apps import apps
|
||||
from django.core.management import BaseCommand
|
||||
|
@ -33,7 +32,7 @@ def get_file_fields():
|
|||
return fields
|
||||
|
||||
|
||||
def get_used_media() -> Set[Path]:
|
||||
def get_used_media() -> set[Path]:
|
||||
media = set()
|
||||
for field in get_file_fields():
|
||||
is_null = {
|
||||
|
@ -54,7 +53,7 @@ def get_used_media() -> Set[Path]:
|
|||
return media
|
||||
|
||||
|
||||
def get_all_media(schema: str) -> Set[Path]:
|
||||
def get_all_media(schema: str) -> set[Path]:
|
||||
media = set()
|
||||
schema_media_root = media_root / schema
|
||||
cache_dir = schema_media_root / "cache"
|
||||
|
|
|
@ -8,7 +8,7 @@ class Command(BaseCommand):
|
|||
help = 'List all campaigns registered on instance'
|
||||
|
||||
def __init__(self, *args, **kwargs):
|
||||
super(Command, self).__init__(*args, **kwargs)
|
||||
super().__init__(*args, **kwargs)
|
||||
|
||||
def handle(self, *args, **options):
|
||||
campaigns = Campaign.objects.all()
|
||||
|
|
|
@ -7,7 +7,7 @@ class Command(BaseCommand):
|
|||
help = 'List all users registered on instance'
|
||||
|
||||
def __init__(self, *args, **kwargs):
|
||||
super(Command, self).__init__(*args, **kwargs)
|
||||
super().__init__(*args, **kwargs)
|
||||
|
||||
def handle(self, *args, **options):
|
||||
users = TenantUser.objects.all()
|
||||
|
|
|
@ -21,7 +21,7 @@ class Command(BaseCommand):
|
|||
parser.add_argument('--store', action='store_true')
|
||||
|
||||
def __init__(self, *args, **kwargs):
|
||||
super(Command, self).__init__(*args, **kwargs)
|
||||
super().__init__(*args, **kwargs)
|
||||
|
||||
def handle(self, *args, **options):
|
||||
store = options["store"]
|
||||
|
|
|
@ -11,7 +11,7 @@ class Command(BaseCommand):
|
|||
help = 'sets up DTU'
|
||||
|
||||
def __init__(self, *args, **kwargs):
|
||||
super(Command, self).__init__(*args, **kwargs)
|
||||
super().__init__(*args, **kwargs)
|
||||
|
||||
def handle(self, *args, **options):
|
||||
create_public_tenant("test.localhost", "rpgnotes_admin@lw1.at")
|
||||
|
|
|
@ -8,7 +8,7 @@ class Command(BaseCommand):
|
|||
help = 'adds and removes users to/from campaigns'
|
||||
|
||||
def __init__(self, *args, **kwargs):
|
||||
super(Command, self).__init__(*args, **kwargs)
|
||||
super().__init__(*args, **kwargs)
|
||||
|
||||
def add_arguments(self, parser: CommandParser):
|
||||
parser.add_argument("campaign_slug", type=str)
|
||||
|
|
|
@ -16,4 +16,4 @@ class DescriptionModel(models.Model):
|
|||
self.description_html, linked_objects = md_to_html(self.description_md)
|
||||
self.linked_objects = ",".join(linked_objects)
|
||||
|
||||
super(DescriptionModel, self).save(*args, **kwargs)
|
||||
super().save(*args, **kwargs)
|
||||
|
|
|
@ -16,7 +16,7 @@ class NameSlugModel(models.Model):
|
|||
# Newly created object, so set slug
|
||||
self.slug = slugify(self.name)
|
||||
|
||||
super(NameSlugModel, self).save(*args, **kwargs)
|
||||
super().save(*args, **kwargs)
|
||||
|
||||
def __str__(self):
|
||||
return self.name
|
||||
|
|
|
@ -18,6 +18,6 @@ def srcset(filename):
|
|||
"""
|
||||
lines = [filename]
|
||||
for res in settings.THUMBNAIL_ALTERNATIVE_RESOLUTIONS:
|
||||
res_string = "{}x".format(res)
|
||||
lines.append("{} {}".format(resolution(filename, res_string), res_string))
|
||||
res_string = f"{res}x"
|
||||
lines.append(f"{resolution(filename, res_string)} {res_string}")
|
||||
return ', '.join(lines)
|
||||
|
|
|
@ -1,7 +1,8 @@
|
|||
import json
|
||||
from collections.abc import Generator
|
||||
from functools import lru_cache
|
||||
from pathlib import Path
|
||||
from typing import TypedDict, Dict, List, Optional, Generator
|
||||
from typing import TypedDict
|
||||
|
||||
from django.templatetags.static import static
|
||||
from django_jinja import library
|
||||
|
@ -13,21 +14,21 @@ class Asset(TypedDict):
|
|||
file: str
|
||||
srf: str
|
||||
isEntry: bool
|
||||
imports: Optional[List[str]]
|
||||
isDynamicEntry: Optional[bool]
|
||||
imports: list[str] | None
|
||||
isDynamicEntry: bool | None
|
||||
|
||||
|
||||
Manifest = Dict[str, Asset]
|
||||
Manifest = dict[str, Asset]
|
||||
|
||||
|
||||
@lru_cache()
|
||||
@lru_cache
|
||||
def load_vite_manifest() -> Manifest:
|
||||
with (Path(STATIC_ROOT) / "build" / "manifest.json").open() as f:
|
||||
return json.load(f)
|
||||
|
||||
|
||||
@library.global_function
|
||||
@lru_cache()
|
||||
@lru_cache
|
||||
def js_asset(entry_point: str) -> Asset:
|
||||
manifest = load_vite_manifest()
|
||||
try:
|
||||
|
@ -37,7 +38,7 @@ def js_asset(entry_point: str) -> Asset:
|
|||
|
||||
|
||||
@library.global_function
|
||||
@lru_cache()
|
||||
@lru_cache
|
||||
def js_asset_url(entry_point: str) -> str:
|
||||
asset = js_asset(entry_point)
|
||||
|
||||
|
|
|
@ -24,7 +24,7 @@ class SearchResultsView(TemplateView):
|
|||
if "q" not in self.request.GET:
|
||||
return ""
|
||||
query_string = self.request.GET['q']
|
||||
context = super(SearchResultsView, self).get_context_data(**kwargs)
|
||||
context = super().get_context_data(**kwargs)
|
||||
campaign: Campaign = self.request.tenant
|
||||
config = campaign.language
|
||||
name_vector = SearchVector('name', weight="A", config=config)
|
||||
|
|
|
@ -2,7 +2,6 @@
|
|||
colors from https://stackoverflow.com/a/33295456/4398037
|
||||
"""
|
||||
import random
|
||||
from typing import Tuple
|
||||
|
||||
color_string = """#B88183
|
||||
#922329
|
||||
|
@ -284,12 +283,12 @@ def gamma_correction(value: float) -> float:
|
|||
return ((value + 0.055) / 1.055) ** 2.4
|
||||
|
||||
|
||||
def get_luminance(rgb: Tuple[int, ...]) -> float:
|
||||
def get_luminance(rgb: tuple[int, ...]) -> float:
|
||||
r, g, b = list(map(gamma_correction, rgb))
|
||||
return 0.2126 * r + 0.7152 * g + 0.0722 * b
|
||||
|
||||
|
||||
def get_percieved_lightness(rgb: Tuple[int, ...]) -> float:
|
||||
def get_percieved_lightness(rgb: tuple[int, ...]) -> float:
|
||||
Y = get_luminance(rgb)
|
||||
if Y <= (216 / 24389):
|
||||
return Y * (24389 / 27)
|
||||
|
|
|
@ -9,7 +9,7 @@ from bleach_allowlist import markdown_tags, markdown_attrs
|
|||
custom_allowed_tags = ["del", "ins"]
|
||||
|
||||
|
||||
def md_to_html(md: str, replacements=None) -> Tuple[str, Set[str]]:
|
||||
def md_to_html(md: str, replacements=None) -> tuple[str, set[str]]:
|
||||
md, linked_objects = autolink(md, replacements=replacements)
|
||||
html = markdown.markdown(
|
||||
md,
|
||||
|
@ -26,7 +26,7 @@ def md_to_html(md: str, replacements=None) -> Tuple[str, Set[str]]:
|
|||
return html, linked_objects
|
||||
|
||||
|
||||
def autolink(md: str, replacements=None) -> Tuple[str, Set[str]]:
|
||||
def autolink(md: str, replacements=None) -> tuple[str, set[str]]:
|
||||
if replacements is None:
|
||||
from utils.urls import name2url
|
||||
replacements = name2url()
|
||||
|
|
|
@ -7,7 +7,7 @@ from loot.models import Loot
|
|||
from notes.models import Note
|
||||
|
||||
|
||||
def name2url() -> Dict[str, str]:
|
||||
def name2url() -> dict[str, str]:
|
||||
data = {}
|
||||
objects = []
|
||||
objects.extend(Character.objects.all())
|
||||
|
|
Loading…
Reference in a new issue