diff --git a/server/account/models.py b/server/account/models.py index 7947a410..f2d76302 100644 --- a/server/account/models.py +++ b/server/account/models.py @@ -1,5 +1,5 @@ -from django.db import models from django.contrib.auth.models import AbstractUser +from django.db import models from tournament.models import Tournament diff --git a/server/club/admin.py b/server/club/admin.py index 12cc4651..74555780 100644 --- a/server/club/admin.py +++ b/server/club/admin.py @@ -1,5 +1,5 @@ -from django.contrib import admin from django import forms +from django.contrib import admin from club.models import Club diff --git a/server/club/pantheon_games/management/commands/associate_players_with_club.py b/server/club/pantheon_games/management/commands/associate_players_with_club.py index 7f1d67ab..9e5dbe02 100644 --- a/server/club/pantheon_games/management/commands/associate_players_with_club.py +++ b/server/club/pantheon_games/management/commands/associate_players_with_club.py @@ -2,7 +2,7 @@ from django.utils import timezone from club.models import Club -from club.pantheon_games.models import PantheonEvent, PantheonSession, PantheonSessionResult, PantheonPlayer +from club.pantheon_games.models import PantheonEvent, PantheonPlayer, PantheonSession, PantheonSessionResult from player.models import Player diff --git a/server/club/pantheon_games/management/commands/load_pantheon_data.py b/server/club/pantheon_games/management/commands/load_pantheon_data.py index d3ede8d4..97401b86 100644 --- a/server/club/pantheon_games/management/commands/load_pantheon_data.py +++ b/server/club/pantheon_games/management/commands/load_pantheon_data.py @@ -5,9 +5,9 @@ from django.db import transaction from django.utils import timezone -from club.club_games.models import ClubSession, ClubSessionResult, ClubRating, ClubSessionSyncData +from club.club_games.models import ClubRating, ClubSession, ClubSessionResult, ClubSessionSyncData from club.models import Club -from club.pantheon_games.models import PantheonSession, PantheonSessionResult, PantheonRound +from club.pantheon_games.models import PantheonRound, PantheonSession, PantheonSessionResult from player.models import Player from player.tenhou.models import TenhouAggregatedStatistics diff --git a/server/club/translation.py b/server/club/translation.py index 9c5b8495..75bdacb7 100644 --- a/server/club/translation.py +++ b/server/club/translation.py @@ -1,4 +1,4 @@ -from modeltranslation.translator import translator, TranslationOptions +from modeltranslation.translator import TranslationOptions, translator from club.models import Club diff --git a/server/club/urls.py b/server/club/urls.py index 2d1bda8d..fa89e006 100644 --- a/server/club/urls.py +++ b/server/club/urls.py @@ -1,6 +1,6 @@ from django.conf.urls import url -from club.views import club_list, club_details, club_tournaments +from club.views import club_details, club_list, club_tournaments urlpatterns = [ url(r"^riichi/$", club_list, name="club_list"), diff --git a/server/club/views.py b/server/club/views.py index 2d8ec472..a73d645c 100644 --- a/server/club/views.py +++ b/server/club/views.py @@ -1,8 +1,8 @@ from django.db.models import F -from django.shortcuts import render, get_object_or_404 +from django.shortcuts import get_object_or_404, render from django.utils.translation import get_language - from django.utils.translation import gettext as _ + from club.models import Club diff --git a/server/ema/views.py b/server/ema/views.py index 05cc2b9f..8a1560a1 100644 --- a/server/ema/views.py +++ b/server/ema/views.py @@ -2,7 +2,7 @@ from django.shortcuts import render -from rating.models import RatingResult, Rating +from rating.models import Rating, RatingResult from rating.utils import get_latest_rating_date diff --git a/server/mahjong_portal/templatetags/meta_tags_helper.py b/server/mahjong_portal/templatetags/meta_tags_helper.py index 2e061ac9..a578cb5e 100644 --- a/server/mahjong_portal/templatetags/meta_tags_helper.py +++ b/server/mahjong_portal/templatetags/meta_tags_helper.py @@ -2,7 +2,7 @@ from django.template.defaultfilters import date from django.utils.translation import gettext as _ -from mahjong_portal.templatetags.russian_words_morph import prepositional, genitive +from mahjong_portal.templatetags.russian_words_morph import genitive, prepositional register = template.Library() diff --git a/server/mahjong_portal/templatetags/russian_words_morph.py b/server/mahjong_portal/templatetags/russian_words_morph.py index 3433abb6..653304a5 100644 --- a/server/mahjong_portal/templatetags/russian_words_morph.py +++ b/server/mahjong_portal/templatetags/russian_words_morph.py @@ -1,5 +1,5 @@ -from django import template import pymorphy2 +from django import template from django.utils.translation import get_language register = template.Library() diff --git a/server/mahjong_portal/urls.py b/server/mahjong_portal/urls.py index ce87c89e..7b97ec62 100644 --- a/server/mahjong_portal/urls.py +++ b/server/mahjong_portal/urls.py @@ -1,19 +1,19 @@ +from django.conf.urls import include, url from django.conf.urls.i18n import i18n_patterns from django.contrib import admin -from django.conf.urls import include, url +from django.contrib.auth import views as auth_views from django.contrib.sitemaps.views import sitemap from django.views.decorators.cache import cache_page -from django.contrib.auth import views as auth_views from mahjong_portal.sitemap import ( - TournamentSitemap, - TournamentAnnouncementSitemap, ClubSitemap, + EMATournamentListSitemap, PlayerSitemap, RatingSitemap, StaticSitemap, + TournamentAnnouncementSitemap, TournamentListSitemap, - EMATournamentListSitemap, + TournamentSitemap, ) from website.views import players_api diff --git a/server/online/admin.py b/server/online/admin.py index 62a619a1..870ca022 100755 --- a/server/online/admin.py +++ b/server/online/admin.py @@ -1,17 +1,17 @@ -from django.contrib import admin from django import forms +from django.contrib import admin from django.urls import reverse from django.utils.safestring import mark_safe from online.models import ( - TournamentStatus, - TournamentPlayers, TournamentGame, TournamentGamePlayer, TournamentNotification, + TournamentPlayers, + TournamentStatus, ) from player.models import Player -from tournament.models import Tournament, OnlineTournamentRegistration +from tournament.models import OnlineTournamentRegistration, Tournament class TournamentGameForm(forms.ModelForm): diff --git a/server/online/handler.py b/server/online/handler.py index 895e91ad..6cc765c6 100755 --- a/server/online/handler.py +++ b/server/online/handler.py @@ -5,7 +5,7 @@ from datetime import timedelta from random import randint from typing import Dict, Optional -from urllib.parse import unquote, urlparse, parse_qs +from urllib.parse import parse_qs, unquote, urlparse import requests from django.conf import settings @@ -15,18 +15,18 @@ from django.utils.translation import gettext as _ from online.models import ( - TournamentPlayers, - TournamentStatus, TournamentGame, TournamentGamePlayer, TournamentNotification, + TournamentPlayers, + TournamentStatus, ) from online.parser import TenhouParser from player.models import Player from player.tenhou.management.commands.add_tenhou_account import get_started_date_for_account from tournament.models import OnlineTournamentRegistration from utils.general import make_random_letters_and_digit_string -from utils.pantheon import add_user_to_pantheon, get_pantheon_swiss_sortition, add_tenhou_game_to_pantheon +from utils.pantheon import add_tenhou_game_to_pantheon, add_user_to_pantheon, get_pantheon_swiss_sortition logger = logging.getLogger() diff --git a/server/online/management/commands/ds_bot.py b/server/online/management/commands/ds_bot.py index a28ebf21..26bcf3c1 100644 --- a/server/online/management/commands/ds_bot.py +++ b/server/online/management/commands/ds_bot.py @@ -6,12 +6,12 @@ from django.conf import settings from django.core.management.base import BaseCommand from django.utils.translation import activate +from django.utils.translation import gettext as _ from online.handler import TournamentHandler from online.models import TournamentNotification from tournament.models import Tournament from utils.logs import set_up_logging -from django.utils.translation import gettext as _ logger = logging.getLogger() diff --git a/server/online/management/commands/tg_bot.py b/server/online/management/commands/tg_bot.py index 07ff7f18..ab4ab83f 100644 --- a/server/online/management/commands/tg_bot.py +++ b/server/online/management/commands/tg_bot.py @@ -5,11 +5,9 @@ from django.core.management.base import BaseCommand from django.db.models import Q from django.utils.translation import activate -from telegram import Update, ParseMode -from telegram.error import Unauthorized, BadRequest, TimedOut, NetworkError, ChatMigrated, TelegramError -from telegram.ext import CommandHandler, CallbackContext, Defaults -from telegram.ext import MessageHandler, Filters -from telegram.ext import Updater +from telegram import ParseMode, Update +from telegram.error import BadRequest, ChatMigrated, NetworkError, TelegramError, TimedOut, Unauthorized +from telegram.ext import CallbackContext, CommandHandler, Defaults, Filters, MessageHandler, Updater from online.handler import TournamentHandler from online.models import TournamentGame, TournamentNotification diff --git a/server/online/parser.py b/server/online/parser.py index 81bc4d88..d29ee579 100644 --- a/server/online/parser.py +++ b/server/online/parser.py @@ -1,10 +1,9 @@ # -*- coding: utf-8 -*- import codecs +import re import struct from urllib.parse import unquote -import re - import requests diff --git a/server/online/views.py b/server/online/views.py index b295e4f9..a12900e8 100644 --- a/server/online/views.py +++ b/server/online/views.py @@ -1,6 +1,6 @@ import requests from django.conf import settings -from django.contrib.auth.decorators import user_passes_test, login_required +from django.contrib.auth.decorators import login_required, user_passes_test from django.http import HttpResponse from django.shortcuts import redirect diff --git a/server/player/mahjong_soul/management/commands/ms_base.py b/server/player/mahjong_soul/management/commands/ms_base.py index 99ad0925..d78adeda 100644 --- a/server/player/mahjong_soul/management/commands/ms_base.py +++ b/server/player/mahjong_soul/management/commands/ms_base.py @@ -1,21 +1,18 @@ -import json -import os - -from django.conf import settings -from django.core.management.base import BaseCommand -from django.utils import timezone import asyncio import hashlib import hmac +import json +import os import random import uuid import aiohttp - +import ms.protocol_pb2 as pb +from django.conf import settings +from django.core.management.base import BaseCommand +from django.utils import timezone from ms.base import MSRPCChannel from ms.rpc import Lobby -import ms.protocol_pb2 as pb - MS_HOST = "https://game.maj-soul.com" diff --git a/server/player/models.py b/server/player/models.py index 7d0c5d91..58dbccf5 100644 --- a/server/player/models.py +++ b/server/player/models.py @@ -3,7 +3,7 @@ from django.utils.translation import gettext as _ from mahjong_portal.models import BaseModel -from settings.models import Country, City +from settings.models import City, Country class Player(BaseModel): diff --git a/server/player/tenhou/admin.py b/server/player/tenhou/admin.py index 86c6b8b9..4ecf6513 100644 --- a/server/player/tenhou/admin.py +++ b/server/player/tenhou/admin.py @@ -1,6 +1,6 @@ from django.contrib import admin -from player.tenhou.models import TenhouStatistics, TenhouAggregatedStatistics +from player.tenhou.models import TenhouAggregatedStatistics, TenhouStatistics class TenhouStatisticsAdmin(admin.ModelAdmin): diff --git a/server/player/tenhou/management/commands/add_tenhou_account.py b/server/player/tenhou/management/commands/add_tenhou_account.py index eb874950..2819d0ea 100644 --- a/server/player/tenhou/management/commands/add_tenhou_account.py +++ b/server/player/tenhou/management/commands/add_tenhou_account.py @@ -4,10 +4,10 @@ from player.models import Player from player.tenhou.models import TenhouNickname from utils.tenhou.helper import ( - recalculate_tenhou_statistics_for_four_players, download_all_games_from_arcturus, - save_played_games, get_started_date_for_account, + recalculate_tenhou_statistics_for_four_players, + save_played_games, ) diff --git a/server/player/tenhou/management/commands/download_all_games.py b/server/player/tenhou/management/commands/download_all_games.py index 565c09d3..163fce7e 100644 --- a/server/player/tenhou/management/commands/download_all_games.py +++ b/server/player/tenhou/management/commands/download_all_games.py @@ -2,10 +2,10 @@ from django.db import transaction from django.utils import timezone -from player.tenhou.models import TenhouStatistics, TenhouNickname +from player.tenhou.models import TenhouNickname, TenhouStatistics from utils.tenhou.helper import ( - recalculate_tenhou_statistics_for_four_players, download_all_games_from_arcturus, + recalculate_tenhou_statistics_for_four_players, save_played_games, ) diff --git a/server/player/tenhou/management/commands/download_latest_games.py b/server/player/tenhou/management/commands/download_latest_games.py index d0ee120d..ab344d70 100644 --- a/server/player/tenhou/management/commands/download_latest_games.py +++ b/server/player/tenhou/management/commands/download_latest_games.py @@ -8,7 +8,7 @@ from django.db import transaction from django.utils import timezone -from player.tenhou.models import TenhouNickname, TenhouGameLog +from player.tenhou.models import TenhouGameLog, TenhouNickname from utils.tenhou.current_tenhou_games import lobbies_dict from utils.tenhou.helper import parse_log_line, recalculate_tenhou_statistics_for_four_players diff --git a/server/player/tenhou/management/commands/update_tenhou_yakuman.py b/server/player/tenhou/management/commands/update_tenhou_yakuman.py index 91f96e66..885be726 100644 --- a/server/player/tenhou/management/commands/update_tenhou_yakuman.py +++ b/server/player/tenhou/management/commands/update_tenhou_yakuman.py @@ -8,7 +8,7 @@ from django.db import transaction from django.utils import timezone -from player.tenhou.models import TenhouNickname, CollectedYakuman +from player.tenhou.models import CollectedYakuman, TenhouNickname def get_date_string(): diff --git a/server/player/tenhou/management/commands/year_statistics.py b/server/player/tenhou/management/commands/year_statistics.py index 0f8c7f34..bfa9da5b 100644 --- a/server/player/tenhou/management/commands/year_statistics.py +++ b/server/player/tenhou/management/commands/year_statistics.py @@ -1,13 +1,13 @@ -from django.core.management.base import BaseCommand from datetime import datetime import pytz +from django.core.management.base import BaseCommand from django.db.models import Sum from player.models import Player from player.tenhou.models import TenhouGameLog from settings.models import City -from tournament.models import TournamentResult, Tournament +from tournament.models import Tournament, TournamentResult class Command(BaseCommand): diff --git a/server/player/tenhou/tests.py b/server/player/tenhou/tests.py index e73d0316..474f886d 100644 --- a/server/player/tenhou/tests.py +++ b/server/player/tenhou/tests.py @@ -5,7 +5,7 @@ from django.utils import timezone from player.models import Player -from player.tenhou.models import TenhouNickname, TenhouGameLog, TenhouStatistics +from player.tenhou.models import TenhouGameLog, TenhouNickname, TenhouStatistics from utils.tenhou.points_calculator import FourPlayersPointsCalculator diff --git a/server/player/tenhou/urls.py b/server/player/tenhou/urls.py index 8a1494ab..0aac117c 100644 --- a/server/player/tenhou/urls.py +++ b/server/player/tenhou/urls.py @@ -1,11 +1,11 @@ from django.conf.urls import url from player.tenhou.views import ( + games_history, get_current_tenhou_games, get_current_tenhou_games_async, latest_yakumans, tenhou_accounts, - games_history, ) urlpatterns = [ diff --git a/server/player/tenhou/views.py b/server/player/tenhou/views.py index 65919203..b2a531ca 100644 --- a/server/player/tenhou/views.py +++ b/server/player/tenhou/views.py @@ -6,7 +6,7 @@ from django.shortcuts import render from django.utils import timezone -from player.tenhou.models import TenhouNickname, CollectedYakuman, TenhouGameLog, TenhouAggregatedStatistics +from player.tenhou.models import CollectedYakuman, TenhouAggregatedStatistics, TenhouGameLog, TenhouNickname from utils.tenhou.current_tenhou_games import get_latest_wg_games diff --git a/server/player/translation.py b/server/player/translation.py index a2d46f76..6492239e 100644 --- a/server/player/translation.py +++ b/server/player/translation.py @@ -1,4 +1,4 @@ -from modeltranslation.translator import translator, TranslationOptions +from modeltranslation.translator import TranslationOptions, translator from player.models import Player, PlayerTitle diff --git a/server/player/urls.py b/server/player/urls.py index fb124419..906e8863 100644 --- a/server/player/urls.py +++ b/server/player/urls.py @@ -1,14 +1,14 @@ from django.conf.urls import url from player.views import ( - player_details, - player_rating_details, player_by_id_details, - player_tournaments, player_by_id_tenhou_details, - player_tenhou_details, - player_rating_changes, + player_details, player_ms_details, + player_rating_changes, + player_rating_details, + player_tenhou_details, + player_tournaments, ) urlpatterns = [ diff --git a/server/player/views.py b/server/player/views.py index 255f97fd..6414e5dc 100644 --- a/server/player/views.py +++ b/server/player/views.py @@ -1,13 +1,13 @@ from collections import defaultdict from django.db.models import F -from django.shortcuts import render, get_object_or_404, redirect +from django.shortcuts import get_object_or_404, redirect, render from club.club_games.models import ClubRating from player.mahjong_soul.models import MSAccount from player.models import Player -from player.tenhou.models import TenhouNickname, TenhouAggregatedStatistics -from rating.models import RatingDelta, Rating, RatingResult, TournamentCoefficients +from player.tenhou.models import TenhouAggregatedStatistics, TenhouNickname +from rating.models import Rating, RatingDelta, RatingResult, TournamentCoefficients from rating.utils import get_latest_rating_date, parse_rating_date from tournament.models import TournamentResult diff --git a/server/rating/calculation/rr.py b/server/rating/calculation/rr.py index e84ef22a..6e00873c 100644 --- a/server/rating/calculation/rr.py +++ b/server/rating/calculation/rr.py @@ -10,7 +10,7 @@ from player.models import Player from rating.calculation.hardcoded_coefficients import HARDCODED_COEFFICIENTS from rating.models import RatingDelta, RatingResult, TournamentCoefficients -from tournament.models import TournamentResult, Tournament +from tournament.models import Tournament, TournamentResult from utils.general import get_tournament_coefficient diff --git a/server/rating/management/commands/rating_calculate.py b/server/rating/management/commands/rating_calculate.py index de34e137..66d4cbb1 100644 --- a/server/rating/management/commands/rating_calculate.py +++ b/server/rating/management/commands/rating_calculate.py @@ -8,7 +8,7 @@ from rating.calculation.ema import RatingEMACalculation from rating.calculation.online import RatingOnlineCalculation from rating.calculation.rr import RatingRRCalculation -from rating.models import Rating, RatingDelta, RatingResult, RatingDate +from rating.models import Rating, RatingDate, RatingDelta, RatingResult from tournament.models import Tournament, TournamentResult diff --git a/server/rating/management/commands/reset_tournament_dates.py b/server/rating/management/commands/reset_tournament_dates.py index ce5f8340..810edff5 100644 --- a/server/rating/management/commands/reset_tournament_dates.py +++ b/server/rating/management/commands/reset_tournament_dates.py @@ -1,6 +1,6 @@ from django.core.management.base import BaseCommand -from rating.models import RatingDate, RatingResult, RatingDelta, Rating +from rating.models import Rating, RatingDate, RatingDelta, RatingResult from tournament.models import Tournament diff --git a/server/rating/management/commands/validate_ema_rating.py b/server/rating/management/commands/validate_ema_rating.py index 2da948ae..a6189d19 100644 --- a/server/rating/management/commands/validate_ema_rating.py +++ b/server/rating/management/commands/validate_ema_rating.py @@ -6,7 +6,7 @@ from django.core.management.base import BaseCommand from django.template.defaultfilters import floatformat -from rating.models import RatingResult, Rating +from rating.models import Rating, RatingResult class Command(BaseCommand): diff --git a/server/rating/mixins.py b/server/rating/mixins.py index b58b1d48..83a2402e 100644 --- a/server/rating/mixins.py +++ b/server/rating/mixins.py @@ -2,9 +2,9 @@ from player.models import Player from rating.models import RatingDelta -from utils.general import make_random_letters_and_digit_string from settings.models import Country from tournament.models import Tournament, TournamentResult +from utils.general import make_random_letters_and_digit_string class RatingTestMixin(object): diff --git a/server/rating/tests/tests_inner.py b/server/rating/tests/tests_inner.py index 48a2ad2b..62300750 100644 --- a/server/rating/tests/tests_inner.py +++ b/server/rating/tests/tests_inner.py @@ -1,4 +1,5 @@ from datetime import datetime, timedelta + from django.test import TestCase from django.utils import timezone diff --git a/server/rating/translation.py b/server/rating/translation.py index 38b27b5d..bce91645 100644 --- a/server/rating/translation.py +++ b/server/rating/translation.py @@ -1,4 +1,4 @@ -from modeltranslation.translator import translator, TranslationOptions +from modeltranslation.translator import TranslationOptions, translator from rating.models import Rating diff --git a/server/rating/urls.py b/server/rating/urls.py index 710212ac..e8c33889 100644 --- a/server/rating/urls.py +++ b/server/rating/urls.py @@ -1,6 +1,6 @@ from django.conf.urls import url -from rating.views import rating_details, rating_list, rating_tournaments, rating_dates +from rating.views import rating_dates, rating_details, rating_list, rating_tournaments urlpatterns = [ url(r"^riichi/list/$", rating_list, name="rating_list"), diff --git a/server/rating/views.py b/server/rating/views.py index 16f2a436..ff4cbfe3 100644 --- a/server/rating/views.py +++ b/server/rating/views.py @@ -1,12 +1,12 @@ -from django.http import JsonResponse, Http404 -from django.shortcuts import render, get_object_or_404 +from django.http import Http404, JsonResponse +from django.shortcuts import get_object_or_404, render from django.utils import timezone from rating.calculation.crr import RatingCRRCalculation from rating.calculation.hardcoded_coefficients import HARDCODED_COEFFICIENTS from rating.calculation.online import RatingOnlineCalculation from rating.calculation.rr import RatingRRCalculation -from rating.models import Rating, RatingResult, RatingDelta, TournamentCoefficients, RatingDate +from rating.models import Rating, RatingDate, RatingDelta, RatingResult, TournamentCoefficients from rating.utils import get_latest_rating_date, parse_rating_date from settings.models import Country from tournament.models import Tournament diff --git a/server/settings/admin.py b/server/settings/admin.py index fa1d1b55..05bd6864 100644 --- a/server/settings/admin.py +++ b/server/settings/admin.py @@ -1,7 +1,7 @@ from django import forms from django.contrib import admin -from settings.models import Country, City +from settings.models import City, Country class CountryAdmin(admin.ModelAdmin): diff --git a/server/settings/translation.py b/server/settings/translation.py index 7bdf5ccc..e8319528 100644 --- a/server/settings/translation.py +++ b/server/settings/translation.py @@ -1,6 +1,6 @@ -from modeltranslation.translator import translator, TranslationOptions +from modeltranslation.translator import TranslationOptions, translator -from settings.models import Country, City +from settings.models import City, Country class CountryTranslationOptions(TranslationOptions): diff --git a/server/system/decorators.py b/server/system/decorators.py index c6704c94..7a5a6562 100644 --- a/server/system/decorators.py +++ b/server/system/decorators.py @@ -1,4 +1,5 @@ from functools import wraps + from django.shortcuts import redirect from django.urls import reverse diff --git a/server/system/ema_players_admin/urls.py b/server/system/ema_players_admin/urls.py index dbe863f0..735713c6 100644 --- a/server/system/ema_players_admin/urls.py +++ b/server/system/ema_players_admin/urls.py @@ -1,6 +1,6 @@ from django.conf.urls import url -from system.ema_players_admin.views import list_of_ema_players, download_players_list_csv, add_new_player, assign_ema_id +from system.ema_players_admin.views import add_new_player, assign_ema_id, download_players_list_csv, list_of_ema_players urlpatterns = [ url(r"^list/$", list_of_ema_players, name="list_of_ema_players"), diff --git a/server/system/ema_players_admin/views.py b/server/system/ema_players_admin/views.py index d2965569..ab0b2e74 100644 --- a/server/system/ema_players_admin/views.py +++ b/server/system/ema_players_admin/views.py @@ -4,7 +4,7 @@ from django.contrib.auth.decorators import login_required, user_passes_test from django.db.models import Q from django.http import HttpResponse -from django.shortcuts import render, redirect, get_object_or_404 +from django.shortcuts import get_object_or_404, redirect, render from django.utils.text import slugify from player.models import Player diff --git a/server/system/tournament_admin/urls.py b/server/system/tournament_admin/urls.py index 9fdd5b4a..b2635bb5 100644 --- a/server/system/tournament_admin/urls.py +++ b/server/system/tournament_admin/urls.py @@ -1,16 +1,16 @@ from django.conf.urls import url from system.tournament_admin.views import ( - new_tournaments, - upload_results, + approve_registration, managed_tournaments, - tournament_manage, - toggle_registration, - toggle_premoderation, - tournament_edit, + new_tournaments, remove_registration, - approve_registration, toggle_highlight, + toggle_premoderation, + toggle_registration, + tournament_edit, + tournament_manage, + upload_results, ) urlpatterns = [ diff --git a/server/system/tournament_admin/views.py b/server/system/tournament_admin/views.py index 0f1fdb69..bc78189d 100644 --- a/server/system/tournament_admin/views.py +++ b/server/system/tournament_admin/views.py @@ -1,13 +1,13 @@ import csv from django.contrib.auth.decorators import login_required, user_passes_test -from django.shortcuts import render, get_object_or_404, redirect +from django.shortcuts import get_object_or_404, redirect, render from player.models import Player -from utils.general import transliterate_name from system.decorators import tournament_manager_auth_required -from system.tournament_admin.forms import UploadResultsForm, TournamentForm -from tournament.models import Tournament, TournamentResult, TournamentRegistration, OnlineTournamentRegistration +from system.tournament_admin.forms import TournamentForm, UploadResultsForm +from tournament.models import OnlineTournamentRegistration, Tournament, TournamentRegistration, TournamentResult +from utils.general import transliterate_name @login_required diff --git a/server/system/urls.py b/server/system/urls.py index 6c9c6132..d74e4d39 100644 --- a/server/system/urls.py +++ b/server/system/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls import url, include +from django.conf.urls import include, url from system.views import system_index, transliterate_text diff --git a/server/tournament/admin.py b/server/tournament/admin.py index 94957d52..0111b690 100644 --- a/server/tournament/admin.py +++ b/server/tournament/admin.py @@ -4,10 +4,10 @@ from django.utils.safestring import mark_safe from tournament.models import ( - Tournament, - TournamentRegistration, OnlineTournamentRegistration, + Tournament, TournamentApplication, + TournamentRegistration, TournamentResult, ) diff --git a/server/tournament/forms.py b/server/tournament/forms.py index 97cf9ae8..01c57602 100644 --- a/server/tournament/forms.py +++ b/server/tournament/forms.py @@ -1,7 +1,7 @@ from django import forms from django.utils.translation import ugettext_lazy as _ -from tournament.models import TournamentRegistration, OnlineTournamentRegistration, TournamentApplication +from tournament.models import OnlineTournamentRegistration, TournamentApplication, TournamentRegistration class TournamentRegistrationForm(forms.ModelForm): diff --git a/server/tournament/translation.py b/server/tournament/translation.py index 1d43e762..18f85a60 100644 --- a/server/tournament/translation.py +++ b/server/tournament/translation.py @@ -1,4 +1,4 @@ -from modeltranslation.translator import translator, TranslationOptions +from modeltranslation.translator import TranslationOptions, translator from tournament.models import Tournament diff --git a/server/tournament/urls.py b/server/tournament/urls.py index 9dd5738b..306c0158 100644 --- a/server/tournament/urls.py +++ b/server/tournament/urls.py @@ -1,11 +1,11 @@ from django.conf.urls import url from tournament.views import ( - tournament_list, - tournament_details, tournament_announcement, - tournament_registration, tournament_application, + tournament_details, + tournament_list, + tournament_registration, ) urlpatterns = [ diff --git a/server/tournament/views.py b/server/tournament/views.py index b2712402..795d6202 100644 --- a/server/tournament/views.py +++ b/server/tournament/views.py @@ -1,14 +1,14 @@ from django.contrib import messages -from django.shortcuts import render, get_object_or_404, redirect +from django.shortcuts import get_object_or_404, redirect, render from django.utils import timezone +from django.utils.translation import gettext as _ from django.views.decorators.csrf import csrf_exempt from django.views.decorators.http import require_POST -from django.utils.translation import gettext as _ from player.models import Player from settings.models import City -from tournament.forms import TournamentRegistrationForm, OnlineTournamentRegistrationForm, TournamentApplicationForm -from tournament.models import Tournament, TournamentResult, TournamentRegistration, OnlineTournamentRegistration +from tournament.forms import OnlineTournamentRegistrationForm, TournamentApplicationForm, TournamentRegistrationForm +from tournament.models import OnlineTournamentRegistration, Tournament, TournamentRegistration, TournamentResult def tournament_list(request, tournament_type=None, year=None): diff --git a/server/utils/general.py b/server/utils/general.py index 72cb38c0..864f21d4 100644 --- a/server/utils/general.py +++ b/server/utils/general.py @@ -1,6 +1,6 @@ import calendar -import string import random +import string from datetime import datetime import pytz diff --git a/server/utils/pantheon.py b/server/utils/pantheon.py index 9c3e6e22..4ea2dc95 100644 --- a/server/utils/pantheon.py +++ b/server/utils/pantheon.py @@ -7,7 +7,6 @@ from online.models import TournamentPlayers from utils.general import make_random_letters_and_digit_string - logger = logging.getLogger() diff --git a/server/utils/tenhou/helper.py b/server/utils/tenhou/helper.py index 77770569..f9e4fa14 100644 --- a/server/utils/tenhou/helper.py +++ b/server/utils/tenhou/helper.py @@ -6,7 +6,7 @@ from bs4 import BeautifulSoup from django.db import transaction -from player.tenhou.models import TenhouStatistics, TenhouGameLog, TenhouAggregatedStatistics +from player.tenhou.models import TenhouAggregatedStatistics, TenhouGameLog, TenhouStatistics from utils.general import get_month_first_day, get_month_last_day from utils.tenhou.current_tenhou_games import lobbies_dict from utils.tenhou.points_calculator import FourPlayersPointsCalculator diff --git a/server/website/urls.py b/server/website/urls.py index dd6afd1a..79f047e9 100644 --- a/server/website/urls.py +++ b/server/website/urls.py @@ -1,17 +1,17 @@ from django.conf.urls import url from website.views import ( - home, about, - search, + championships, city_page, - online_tournament_rules, contacts, - iormc_2018, ermc_qualification_2019, export_tournament_results, + home, + iormc_2018, + online_tournament_rules, rating_faq, - championships, + search, wrc_qualification_2020, ) diff --git a/server/website/views.py b/server/website/views.py index 1b8815de..20bbb610 100644 --- a/server/website/views.py +++ b/server/website/views.py @@ -3,8 +3,8 @@ from django.contrib.auth.decorators import login_required, user_passes_test from django.db.models import Q -from django.http import JsonResponse, HttpResponse -from django.shortcuts import render, get_object_or_404 +from django.http import HttpResponse, JsonResponse +from django.shortcuts import get_object_or_404, render from django.utils import translation from django.utils.text import slugify from django.utils.translation import get_language