isort

admin_patches/admin_patches.py

@@ -1,9 +1,9 @@
-from os import path
 import argparse
 import gettext
+from os import path
 
-from utils import find_data_file, die, info
-from utils.patcher import validate_files, patch_files
+from utils import die, find_data_file, info
+from utils.patcher import patch_files, validate_files
 
 _ = gettext.gettext
 

admin_patches/utils/patch.py

@@ -12,12 +12,18 @@
 """
 from __future__ import print_function
 
-__author__ = "anatoly techtonik <techtonik@gmail.com>"
-__version__ = "1.16"
-
 import copy
 import logging
+import os
+import posixpath
 import re
+import shutil
+import sys
+from os.path import abspath, exists, isfile
+
+__author__ = "anatoly techtonik <techtonik@gmail.com>"
+__version__ = "1.16"
+
 
 # cStringIO doesn't support unicode in 2.5
 try:
@@ -29,11 +35,6 @@
 except ImportError:
   import urllib.request as urllib_request
 
-from os.path import exists, isfile, abspath
-import os
-import posixpath
-import shutil
-import sys
 
 
 PY3K = sys.version_info >= (3, 0)

admin_patches/utils/patcher.py

@@ -1,6 +1,6 @@
+import gettext
 import os
 from hashlib import md5
-import gettext
 
 from checksums import ORIG_MD5
 from utils import find_data_file, info, warning

magicked_admin/chatbot/chatbot.py

@@ -1,13 +1,12 @@
-from os import path
 import gettext
+from os import path
 
 from chatbot import INIT_TEMPLATE
 from chatbot.command_map import CommandMap
 from chatbot.command_scheduler import CommandScheduler
-from utils import debug, find_data_file
+from utils import debug, find_data_file, warning
 from web_admin.chat import ChatListener
 from web_admin.constants import *
-from utils import warning
 
 _ = gettext.gettext
 

magicked_admin/chatbot/command_scheduler.py

@@ -1,6 +1,6 @@
+import gettext
 import threading
 import time
-import gettext
 
 from chatbot.commands.command import Command
 from utils import warning

magicked_admin/chatbot/commands/command.py

@@ -1,8 +1,8 @@
-from argparse import ArgumentError
 import gettext
+from argparse import ArgumentError
 
 from chatbot.commands.argument_parser import ArgumentParser
-from utils import debug, BANNER_URL
+from utils import BANNER_URL, debug
 from utils.text import pad_output
 from web_admin.constants import *
 

magicked_admin/chatbot/commands/event_commands.py

@@ -1,6 +1,5 @@
-from chatbot.command_scheduler import (CommandOnJoin, CommandOnTime,
-                                       CommandOnTrader, CommandOnWave,
-                                       ALL_WAVES)
+from chatbot.command_scheduler import (ALL_WAVES, CommandOnJoin, CommandOnTime,
+                                       CommandOnTrader, CommandOnWave)
 from chatbot.commands.command import Command
 
 

magicked_admin/chatbot/commands/info_commands.py

@@ -1,5 +1,5 @@
-import time
 import os
+import time
 
 from chatbot.commands.command import Command
 from server.player import Player

magicked_admin/chatbot/commands/server_commands.py

@@ -2,8 +2,8 @@
 
 import server.game as game
 from chatbot.commands.command import Command
-from web_admin.constants import *
 from utils import find_data_file
+from web_admin.constants import *
 
 
 class CommandBan(Command):

magicked_admin/database/database.py

@@ -1,7 +1,7 @@
+import gettext
 import sqlite3
 from os import path
 from threading import Lock
-import gettext
 
 from utils import find_data_file, info
 

magicked_admin/magicked_admin.py

@@ -4,10 +4,11 @@
 Released under the terms of the MIT license
 """
 
+import argparse
+import gettext
 import os
 import signal
 import sys
-import argparse
 
 from colorama import init
 
@@ -18,7 +19,6 @@
 from utils import banner, die, find_data_file, info, warning
 from utils.net import phone_home
 from utils.text import str_to_bool
-import gettext
 
 _ = gettext.gettext
 

magicked_admin/server/game.py

@@ -1,6 +1,7 @@
+import gettext
+
 import web_admin as api
 from web_admin.constants import *
-import gettext
 
 _ = gettext.gettext
 

magicked_admin/server/game_tracker.py

@@ -1,13 +1,13 @@
+import gettext
 import threading
 import time
-import gettext
+
 from colorama import init
 from termcolor import colored
 
 from utils import BANNER_URL, warning
 from web_admin.constants import *
 
-
 _ = gettext.gettext
 init()
 

magicked_admin/server/motd_updater.py

@@ -1,6 +1,6 @@
+import gettext
 import threading
 import time
-import gettext
 from os import path
 
 from utils import debug, find_data_file, warning

magicked_admin/server/player.py

@@ -1,5 +1,5 @@
-import time
 import gettext
+import time
 
 _ = gettext.gettext
 

magicked_admin/server/server.py

@@ -1,6 +1,7 @@
-from termcolor import colored
 import gettext
 
+from termcolor import colored
+
 import web_admin as api
 from database.database import ServerDatabase
 from server.game import Game, GameMap

magicked_admin/settings.py

@@ -1,7 +1,7 @@
 import configparser
+import gettext
 import os
 from getpass import getpass
-import gettext
 
 from utils import die, fatal, find_data_file, info
 from utils.net import resolve_address

magicked_admin/utils/net.py

@@ -1,6 +1,7 @@
+import gettext
 from urllib.parse import urlparse
 from urllib.request import urlopen
-import gettext
+
 import requests
 
 _ = gettext.gettext

magicked_admin/web_admin/web_admin.py

@@ -1,5 +1,6 @@
-from itertools import groupby
 import gettext
+from itertools import groupby
+
 from lxml import html
 
 from utils import warning

magicked_admin/web_admin/web_interface.py

@@ -1,6 +1,7 @@
+import gettext
 import time
 from hashlib import sha1
-import gettext
+
 import requests
 from lxml import html
 

tests/magicked_admin/utils/test_text.py

@@ -1,8 +1,7 @@
 import pytest
 
-from magicked_admin.utils.text import (
-    str_to_bool, trim_string, pad_output, millify
-)
+from magicked_admin.utils.text import (millify, pad_output, str_to_bool,
+                                       trim_string)
 
 
 def test_str_to_bool():