From 423f9f9664cf4614cefe1c6e621732f605c8f4ae Mon Sep 17 00:00:00 2001 From: Adriene Hutchins Date: Mon, 6 Apr 2020 12:26:15 -0400 Subject: [PATCH] Organized imports --- .gitignore | 2 ++ .vscode/settings.json | 19 ++++++++++++++++++- extensions/botlist.py | 4 ++-- extensions/core.py | 20 +++++++++++--------- extensions/developer.py | 22 ++++++++++++---------- extensions/search.py | 8 +++++--- extensions/specialty.py | 2 +- extensions/utils/logging.py | 5 +++-- main.py | 10 ++++++---- 9 files changed, 60 insertions(+), 32 deletions(-) diff --git a/.gitignore b/.gitignore index 2f1d8e7..d1c02f6 100644 --- a/.gitignore +++ b/.gitignore @@ -59,3 +59,5 @@ docs/_build/ extensions/__pycache__/core.cpython-38.pyc .vscode/settings.json +.vscode/settings.json +.vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json index a8d11bc..859361b 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,3 +1,20 @@ { - "python.pythonPath": "/home/taciturasa/.pyenv/versions/3.8.1/bin/python3.8" + "python.pythonPath": "/home/taciturasa/.pyenv/versions/3.8.1/bin/python3.8", + "workbench.colorCustomizations": { + "activityBar.background": "#2f7c47", + "activityBar.activeBackground": "#2f7c47", + "activityBar.activeBorder": "#422c74", + "activityBar.foreground": "#e7e7e7", + "activityBar.inactiveForeground": "#e7e7e799", + "activityBarBadge.background": "#422c74", + "activityBarBadge.foreground": "#e7e7e7", + "titleBar.activeBackground": "#215732", + "titleBar.inactiveBackground": "#21573299", + "titleBar.activeForeground": "#e7e7e7", + "titleBar.inactiveForeground": "#e7e7e799", + "statusBar.background": "#215732", + "statusBarItem.hoverBackground": "#2f7c47", + "statusBar.foreground": "#e7e7e7" + }, + "peacock.color": "#215732" } \ No newline at end of file diff --git a/extensions/botlist.py b/extensions/botlist.py index f06efa4..84a5894 100644 --- a/extensions/botlist.py +++ b/extensions/botlist.py @@ -6,10 +6,10 @@ '''Botlist Cog''' -import discord import aiohttp -from discord.ext import commands, tasks import dbl +import discord +from discord.ext import commands, tasks class BotList(commands.Cog, name='Bot List'): diff --git a/extensions/core.py b/extensions/core.py index 2e310e5..76ae418 100644 --- a/extensions/core.py +++ b/extensions/core.py @@ -5,18 +5,20 @@ '''Core File''' -import discord -import os -from discord.ext import commands -import time -import asyncio -import sys -import cpuinfo import math -import psutil -from extensions.models.help import TaciHelpCommand +import os +import sys +import time from typing import List, Optional +import asyncio +import cpuinfo +import discord +from discord.ext import commands +import psutil + +from extensions.models.help import TaciHelpCommand + class Core(commands.Cog): """Provides all core features of a bot.""" diff --git a/extensions/developer.py b/extensions/developer.py index 644e7ef..342d3bb 100644 --- a/extensions/developer.py +++ b/extensions/developer.py @@ -9,20 +9,22 @@ '''Developer Cog''' -import discord -from discord.ext import commands -import os -import aiohttp -import random -import datetime import collections from contextlib import redirect_stdout -import traceback -import time -import io +import datetime import inspect -import textwrap +import io +import os +import random import subprocess +import textwrap +import time +import traceback + +import aiohttp +import discord +from discord.ext import commands + from extensions.utils import online diff --git a/extensions/search.py b/extensions/search.py index 0c46700..5384413 100644 --- a/extensions/search.py +++ b/extensions/search.py @@ -5,13 +5,15 @@ '''Search Cog''' +from typing import List + import discord from discord.ext import commands -from typing import List -from extensions.models import SearchExceptions import html2text -from urllib.parse import quote_plus import re +from urllib.parse import quote_plus + +from extensions.models import SearchExceptions class Search(commands.Cog, name="Basic"): diff --git a/extensions/specialty.py b/extensions/specialty.py index 37a90c5..349e5a4 100644 --- a/extensions/specialty.py +++ b/extensions/specialty.py @@ -6,9 +6,9 @@ '''Search Cog''' +import aiohttp import discord from discord.ext import commands -import aiohttp from urllib import parse diff --git a/extensions/utils/logging.py b/extensions/utils/logging.py index a7e3eb9..ad06bc1 100644 --- a/extensions/utils/logging.py +++ b/extensions/utils/logging.py @@ -5,11 +5,12 @@ '''Online File''' -import discord -from discord.ext.commands import Context import traceback from typing import Optional +import discord +from discord.ext.commands import Context + class Logging(): """Provides logging utilities for bots.""" diff --git a/main.py b/main.py index 8477ceb..080e91f 100644 --- a/main.py +++ b/main.py @@ -7,14 +7,16 @@ '''Main File''' -import discord -from discord.ext import commands import json import os import sys -import aiohttp -import rethinkdb from typing import List + +import aiohttp +import discord +from discord.ext import commands +import rethinkdb + from extensions.models import SearchExceptions