From 96da1c3c12e96da17b1e394f8fbe202c8b501ba7 Mon Sep 17 00:00:00 2001 From: Ben Date: Fri, 5 Jun 2020 22:45:23 +0100 Subject: [PATCH] Organise imports --- houdini/commands.py | 2 +- houdini/converters.py | 2 +- houdini/data/igloo.py | 3 ++- houdini/data/item.py | 3 ++- houdini/data/plugin.py | 2 +- houdini/handlers/games/match.py | 6 +++--- houdini/handlers/play/mail.py | 5 +++-- houdini/handlers/play/message.py | 2 +- houdini/handlers/play/survey.py | 2 +- 9 files changed, 15 insertions(+), 12 deletions(-) diff --git a/houdini/commands.py b/houdini/commands.py index 117af04..2af85af 100644 --- a/houdini/commands.py +++ b/houdini/commands.py @@ -2,7 +2,7 @@ import inspect from houdini import _AbstractManager, handlers, plugins from houdini.constants import ConflictResolution -from houdini.converters import _ArgumentDeserializer, _listener, ChecklistError +from houdini.converters import ChecklistError, _ArgumentDeserializer, _listener from houdini.cooldown import CooldownError diff --git a/houdini/converters.py b/houdini/converters.py index 65a74f5..b770812 100644 --- a/houdini/converters.py +++ b/houdini/converters.py @@ -7,10 +7,10 @@ from abc import ABC, abstractmethod from houdini.cooldown import CooldownError from houdini.data.igloo import Flooring, Furniture, Igloo, Location from houdini.data.item import Item +from houdini.data.permission import Permission from houdini.data.pet import PenguinPuffle, Puffle from houdini.data.room import Room from houdini.data.stamp import Stamp -from houdini.data.permission import Permission class ChecklistError(Exception): diff --git a/houdini/data/igloo.py b/houdini/data/igloo.py index 624998a..bc8fa7e 100644 --- a/houdini/data/igloo.py +++ b/houdini/data/igloo.py @@ -1,6 +1,7 @@ -from houdini.data import AbstractDataCollection, db from functools import cached_property +from houdini.data import AbstractDataCollection, db + class Flooring(db.Model): __tablename__ = 'flooring' diff --git a/houdini/data/item.py b/houdini/data/item.py index 5493bb5..e84db03 100644 --- a/houdini/data/item.py +++ b/houdini/data/item.py @@ -1,6 +1,7 @@ -from houdini.data import db, AbstractDataCollection from functools import cached_property +from houdini.data import AbstractDataCollection, db + class Item(db.Model): __tablename__ = 'item' diff --git a/houdini/data/plugin.py b/houdini/data/plugin.py index 26be11e..37321e0 100644 --- a/houdini/data/plugin.py +++ b/houdini/data/plugin.py @@ -1,4 +1,4 @@ -from houdini.data import db, AbstractDataCollection +from houdini.data import AbstractDataCollection, db class PluginAttribute(db.Model): diff --git a/houdini/handlers/games/match.py b/houdini/handlers/games/match.py index 5e92f31..15be930 100644 --- a/houdini/handlers/games/match.py +++ b/houdini/handlers/games/match.py @@ -5,9 +5,9 @@ from dataclasses import dataclass from houdini import handlers from houdini.data.room import RoomWaddle from houdini.handlers import XTPacket -from houdini.handlers.games.ninja.card import SenseiLogic, CardJitsuLogic, CardJitsuMatLogic -from houdini.handlers.games.ninja.fire import FireSenseiLogic, CardJitsuFireLogic -from houdini.handlers.games.ninja.water import WaterSenseiLogic, CardJitsuWaterLogic +from houdini.handlers.games.ninja.card import CardJitsuLogic, CardJitsuMatLogic, SenseiLogic +from houdini.handlers.games.ninja.fire import CardJitsuFireLogic, FireSenseiLogic +from houdini.handlers.games.ninja.water import CardJitsuWaterLogic, WaterSenseiLogic from houdini.penguin import Penguin diff --git a/houdini/handlers/play/mail.py b/houdini/handlers/play/mail.py index 442b0db..d49c0e3 100644 --- a/houdini/handlers/play/mail.py +++ b/houdini/handlers/play/mail.py @@ -1,6 +1,7 @@ -import time -import pytz import datetime +import time + +import pytz from houdini import handlers from houdini.data import db diff --git a/houdini/handlers/play/message.py b/houdini/handlers/play/message.py index 6076173..01a2e0e 100644 --- a/houdini/handlers/play/message.py +++ b/houdini/handlers/play/message.py @@ -1,5 +1,5 @@ from houdini import handlers -from houdini.commands import has_command_prefix, invoke_command_string, UnknownCommandException +from houdini.commands import UnknownCommandException, has_command_prefix, invoke_command_string from houdini.data.moderator import ChatFilterRuleCollection from houdini.handlers import XTPacket from houdini.handlers.play.moderation import moderator_ban diff --git a/houdini/handlers/play/survey.py b/houdini/handlers/play/survey.py index 76662f4..ab1c14a 100644 --- a/houdini/handlers/play/survey.py +++ b/houdini/handlers/play/survey.py @@ -1,6 +1,6 @@ from houdini import handlers -from houdini.handlers import XTPacket from houdini.data.penguin import CfcDonation +from houdini.handlers import XTPacket @handlers.handler(XTPacket('e', 'dc'))