diff --git a/nxy/plugins/admin.py b/nxy/plugins/admin.py index fa3c05c..8a15be2 100644 --- a/nxy/plugins/admin.py +++ b/nxy/plugins/admin.py @@ -1,6 +1,5 @@ # -*- coding: utf-8 -*- import irc3 - from docopt import Dict as DocoptDict from irc3.plugins.command import command from irc3.utils import IrcString diff --git a/nxy/plugins/coins.py b/nxy/plugins/coins.py index 2de27e9..a4ddf55 100644 --- a/nxy/plugins/coins.py +++ b/nxy/plugins/coins.py @@ -1,7 +1,6 @@ # -*- coding: utf-8 -*- import irc3 import requests - from docopt import Dict as DocOptDict from irc3.plugins.command import command from irc3.utils import IrcString diff --git a/nxy/plugins/ctcp.py b/nxy/plugins/ctcp.py index 180d533..20c7937 100644 --- a/nxy/plugins/ctcp.py +++ b/nxy/plugins/ctcp.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -import irc3 import time +import irc3 from docopt import Dict as DocOptDict from irc3.plugins.command import command from irc3.utils import IrcString diff --git a/nxy/plugins/linux.py b/nxy/plugins/linux.py index 0ea533a..58475da 100644 --- a/nxy/plugins/linux.py +++ b/nxy/plugins/linux.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- import random + import irc3 import feedparser - from docopt import Dict as DocOptDict from irc3.plugins.command import command from irc3.utils import IrcString diff --git a/nxy/plugins/timer.py b/nxy/plugins/timer.py index baf4673..7a6f375 100644 --- a/nxy/plugins/timer.py +++ b/nxy/plugins/timer.py @@ -1,11 +1,11 @@ # -*- coding: utf-8 -*- -from datetime import datetime, timedelta import asyncio +from datetime import datetime, timedelta +import irc3 from docopt import Dict as DocOptDict from irc3.plugins.command import command from irc3.utils import IrcString -import irc3 from . import DatabasePlugin from ..utils import time_delta diff --git a/nxy/plugins/urban.py b/nxy/plugins/urban.py index bcb818c..ff731bc 100644 --- a/nxy/plugins/urban.py +++ b/nxy/plugins/urban.py @@ -1,7 +1,6 @@ # -*- coding: utf-8 -*- import irc3 import requests - from docopt import Dict as DocOptDict from irc3.plugins.command import command from irc3.utils import IrcString diff --git a/nxy/plugins/useless.py b/nxy/plugins/useless.py index 5df5b0a..a35fc78 100644 --- a/nxy/plugins/useless.py +++ b/nxy/plugins/useless.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -import irc3 import random +import irc3 from docopt import Dict as DocOptDict from irc3.plugins.command import command from irc3.utils import IrcString diff --git a/nxy/plugins/weather.py b/nxy/plugins/weather.py index b2390b2..6ae86af 100644 --- a/nxy/plugins/weather.py +++ b/nxy/plugins/weather.py @@ -1,7 +1,6 @@ # -*- coding: utf-8 -*- import irc3 import requests - from docopt import Dict as DocOptDict from irc3.plugins.command import command from irc3.utils import IrcString diff --git a/nxy/plugins/youtube.py b/nxy/plugins/youtube.py index 0cf0023..e8bcf47 100644 --- a/nxy/plugins/youtube.py +++ b/nxy/plugins/youtube.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -import irc3 import os import re -import requests +import irc3 +import requests from docopt import Dict as DocOptDict from irc3.plugins.command import command from irc3.utils import IrcString diff --git a/nxy/utils/date.py b/nxy/utils/date.py index 67d21f8..9becab0 100644 --- a/nxy/utils/date.py +++ b/nxy/utils/date.py @@ -1,6 +1,5 @@ # -*- coding: utf-8 -*- import re - from datetime import datetime, timedelta @@ -32,6 +31,7 @@ def time_delta(text: str) -> timedelta: return timedelta(**{unit: num}) +# Stolen from uguubot - useless? def time_since(date: datetime, now: datetime = None): """ Takes two datetime objects and returns the time between d and now diff --git a/repl.py b/repl.py index 4fbd135..d13c558 100644 --- a/repl.py +++ b/repl.py @@ -2,15 +2,13 @@ import sys import os import re -from pprint import pprint import requests import psycopg2 from dotenv import load_dotenv from psycopg2.extras import DictCursor -# Handy alias for pprint -pp = pprint +from nxy.utils import * # Load dotenv from DOTENV_FILE variable (or the default one) load_dotenv(os.environ.get('DOTENV_FILE', '.env'))