Run isort formatter over all python files

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
 

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
 

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
 
 

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
 

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
 

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"),

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
 
 

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
 
 

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()
 

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()

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
 

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):

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()
 

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()
 

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

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
 
 

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
 

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"
 

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):

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):

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,
 )
 
 

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,
 )
 

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
 

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():

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):

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
 
 

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 = [

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
 
 

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
 

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 = [

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
 

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