Move state back out of it's own lil module

matchy.py

@@ -5,7 +5,7 @@ import logging
 import discord
 from discord.ext import commands
 import os
-from matchy.files.state import load_from_file
+from matchy.state import load_from_file
 import matchy.cogs.matchy
 import matchy.cogs.owner
 

matchy/cogs/matchy.py

@@ -9,7 +9,7 @@ from datetime import datetime, timedelta, time
 
 import matchy.views.match as match
 import matchy.matching as matching
-from matchy.files.state import State, AuthScope
+from matchy.state import State, AuthScope
 import matchy.util as util
 
 logger = logging.getLogger("cog")

matchy/cogs/owner.py

@@ -3,7 +3,7 @@ Owner bot cog
 """
 import logging
 from discord.ext import commands
-from matchy.files.state import State, AuthScope
+from matchy.state import State, AuthScope
 
 logger = logging.getLogger("owner")
 logger.setLevel(logging.INFO)

matchy/matching.py

@@ -3,7 +3,7 @@ import logging
 import discord
 from datetime import datetime
 from typing import Protocol, runtime_checkable
-from matchy.files.state import State, ts_to_datetime
+from matchy.state import State, ts_to_datetime
 import matchy.util as util
 
 

matchy/views/match.py

@@ -5,7 +5,7 @@ import logging
 import discord
 import re
 
-import matchy.files.state as state
+import matchy.state as state
 import matchy.matching as matching
 
 logger = logging.getLogger("match_button")

tests/matching_test.py

@@ -5,7 +5,7 @@ import discord
 import pytest
 import random
 import matchy.matching as matching
-import matchy.files.state as state
+import matchy.state as state
 import copy
 import itertools
 from datetime import datetime, timedelta

tests/owner_cog_test.py

@@ -2,7 +2,7 @@ import discord
 import discord.ext.commands as commands
 import pytest
 import pytest_asyncio
-import matchy.files.state as state
+import matchy.state as state
 import discord.ext.test as dpytest
 
 from matchy.cogs.owner import OwnerCog

tests/state_test.py

@@ -1,7 +1,7 @@
 """
     Test functions for the state module
 """
-import matchy.files.state as state
+import matchy.state as state
 import tempfile
 import os