fix state location

src/flynt/api.py

@@ -15,7 +15,7 @@
     fstringify_concats,
     fstringify_static_joins,
 )
-from flynt.utils.state import State
+from flynt.state import State
 
 log = logging.getLogger(__name__)
 

src/flynt/candidates/ast_call_candidates.py

@@ -1,7 +1,7 @@
 import ast
 from typing import List
 
-from flynt.utils.state import State
+from flynt.state import State
 
 from .ast_chunk import AstChunk
 

src/flynt/candidates/ast_percent_candidates.py

@@ -1,7 +1,7 @@
 import ast
 from typing import List
 
-from flynt.utils.state import State
+from flynt.state import State
 
 from .ast_chunk import AstChunk
 

src/flynt/cli.py

@@ -9,8 +9,8 @@
 
 from flynt import __version__
 from flynt.api import fstringify, fstringify_code
-from flynt.pyproject_finder import find_pyproject_toml, parse_pyproject_toml
-from flynt.utils.state import State
+from flynt.utils.pyproject_finder import find_pyproject_toml, parse_pyproject_toml
+from flynt.state import State
 
 
 def main():

src/flynt/code_editor.py

@@ -11,7 +11,7 @@
 from flynt.exceptions import FlyntException
 from flynt.utils.format import QuoteTypes as qt
 from flynt.utils.format import get_quote_type
-from flynt.utils.state import State
+from flynt.state import State
 from flynt.static_join.candidates import join_candidates
 from flynt.static_join.transformer import transform_join
 from flynt.string_concat.candidates import concat_candidates

src/flynt/static_join/candidates.py

@@ -2,7 +2,7 @@
 from typing import List
 
 from flynt.candidates.ast_chunk import AstChunk
-from flynt.utils.state import State
+from flynt.state import State
 from flynt.static_join.utils import get_static_join_bits
 
 

src/flynt/string_concat/candidates.py

@@ -2,7 +2,7 @@
 from typing import Iterable, List
 
 from flynt.candidates.ast_chunk import AstChunk
-from flynt.utils.state import State
+from flynt.state import State
 from flynt.utils.utils import is_str_literal
 
 

src/flynt/transform/FstringifyTransformer.py

@@ -3,7 +3,7 @@
 
 from flynt.candidates.ast_call_candidates import is_call_format
 from flynt.linting.fstr_lint import FstrInliner
-from flynt.utils.state import State
+from flynt.state import State
 from flynt.transform.format_call_transforms import joined_string
 from flynt.transform.percent_transformer import is_percent_stringify, transform_binop
 

src/flynt/transform/transform.py

@@ -6,7 +6,7 @@
 
 from flynt.exceptions import ConversionRefused
 from flynt.utils.format import QuoteTypes
-from flynt.utils.state import State
+from flynt.state import State
 from flynt.transform.FstringifyTransformer import fstringify_node
 from flynt.utils.utils import fixup_transformed
 

test/conftest.py

@@ -1,6 +1,6 @@
 import pytest
 
-from flynt.utils.state import State
+from flynt.state import State
 
 
 @pytest.fixture

test/integration/test_api.py

@@ -5,7 +5,7 @@
 
 from flynt import api
 from flynt.api import _fstringify_file
-from flynt.utils.state import State
+from flynt.state import State
 
 # These "files" are byte-string constants instead of actual files to prevent e.g. Git or text editors from accidentally changing the encoding
 invalid_unicode = b"# This is not valid unicode: " + bytes([0xFF, 0xFF])

test/integration/test_concat.py

@@ -5,7 +5,7 @@
 import pytest
 
 from flynt.code_editor import fstringify_code_by_line, fstringify_concats
-from flynt.utils.state import State
+from flynt.state import State
 
 
 def fstringify_and_concats(code: str):

test/integration/test_files.py

@@ -5,7 +5,7 @@
 import pytest
 
 from flynt.code_editor import fstringify_code_by_line
-from flynt.utils.state import State
+from flynt.state import State
 
 
 @pytest.mark.parametrize("filename", samples)

test/test_candidates.py

@@ -2,7 +2,7 @@
 
 from flynt.candidates.ast_percent_candidates import percent_candidates
 from flynt.code_editor import fstring_candidates
-from flynt.utils.state import State
+from flynt.state import State
 
 percent_candidates = partial(percent_candidates, state=State())
 fstring_candidates = partial(fstring_candidates, state=State())

test/test_code_editor.py

@@ -2,7 +2,7 @@
 
 from flynt.candidates.ast_percent_candidates import percent_candidates
 from flynt.code_editor import CodeEditor
-from flynt.utils.state import State
+from flynt.state import State
 
 s0 = """'%s' % (
                     v['key'])"""

test/test_edits.py

@@ -3,7 +3,7 @@
 import pytest
 
 from flynt import code_editor
-from flynt.utils.state import State
+from flynt.state import State
 
 
 def test_timestamp(state: State):

test/test_pyproject.py

@@ -1,6 +1,6 @@
 import os
 
-from flynt.pyproject_finder import find_pyproject_toml, parse_pyproject_toml
+from flynt.utils.pyproject_finder import find_pyproject_toml, parse_pyproject_toml
 
 pyproject_content = """
 [tool.flynt]

test/test_static_join/test_sj_candidates.py

@@ -5,7 +5,7 @@
 
 import pytest
 
-from flynt.utils.state import State
+from flynt.state import State
 from flynt.static_join.candidates import JoinHound, join_candidates
 
 pytestmark = pytest.mark.skipif(

test/test_str_concat/test_candidates.py

@@ -4,7 +4,7 @@
 
 import pytest
 
-from flynt.utils.state import State
+from flynt.state import State
 from flynt.string_concat.candidates import ConcatHound, concat_candidates
 
 

test/test_transform.py

@@ -1,6 +1,6 @@
 import pytest
 
-from flynt.utils.state import State
+from flynt.state import State
 from flynt.transform.transform import transform_chunk