chore: Make .ctlseqs submodule private

- Change: Rename `.ctlseqs` -> `._ctlseqs` - Change: Upadte affected modules and tests.
AnonymouX47 · Dec 31, 2023 · 4630dce · 4630dce
1 parent 2ddea84
commit 4630dce
Show file tree

Hide file tree

Showing 19 changed files with 21 additions and 21 deletions.
diff --git a/src/term_image/ctlseqs.py → src/term_image/_ctlseqs.py b/src/term_image/ctlseqs.py → src/term_image/_ctlseqs.py
diff --git a/src/term_image/image/block.py b/src/term_image/image/block.py
@@ -10,7 +10,7 @@
 
 import PIL
 
-from ..ctlseqs import SGR_BG_DIRECT, SGR_FG_DIRECT, SGR_NORMAL
+from .._ctlseqs import SGR_BG_DIRECT, SGR_FG_DIRECT, SGR_NORMAL
 from ..utils import get_fg_bg_colors
 from .common import TextImage
 

diff --git a/src/term_image/image/common.py b/src/term_image/image/common.py
@@ -35,7 +35,7 @@
 from PIL import Image, UnidentifiedImageError
 
 from .. import get_cell_ratio
-from ..ctlseqs import CURSOR_DOWN, CURSOR_UP, HIDE_CURSOR, SGR_NORMAL, SHOW_CURSOR
+from .._ctlseqs import CURSOR_DOWN, CURSOR_UP, HIDE_CURSOR, SGR_NORMAL, SHOW_CURSOR
 from ..exceptions import (
     InvalidSizeError,
     RenderError,

diff --git a/src/term_image/image/iterm2.py b/src/term_image/image/iterm2.py
@@ -13,10 +13,10 @@
 
 import PIL
 
-from .. import ctlseqs
+from .. import _ctlseqs as ctlseqs
 
 # These sequences are used during performance-critical operations that occur often
-from ..ctlseqs import CURSOR_FORWARD, CURSOR_UP, ERASE_CHARS, ITERM2_START, ST
+from .._ctlseqs import CURSOR_FORWARD, CURSOR_UP, ERASE_CHARS, ITERM2_START, ST
 from ..exceptions import RenderError, TermImageWarning
 from ..utils import (
     ClassInstanceProperty,

diff --git a/src/term_image/image/kitty.py b/src/term_image/image/kitty.py
@@ -12,10 +12,10 @@
 
 import PIL
 
-from .. import ctlseqs
+from .. import _ctlseqs as ctlseqs
 
 # These sequences are used during performance-critical operations that occur often
-from ..ctlseqs import (
+from .._ctlseqs import (
     CURSOR_FORWARD,
     ERASE_CHARS,
     KITTY_DELETE_CURSOR,

diff --git a/src/term_image/padding.py b/src/term_image/padding.py
@@ -21,7 +21,7 @@
 
 from typing_extensions import override
 
-from .ctlseqs import cursor_forward
+from ._ctlseqs import cursor_forward
 from .exceptions import TermImageError
 from .geometry import RawSize, Size, _RawSize, _Size
 from .utils import arg_value_error_range

diff --git a/src/term_image/renderable/_renderable.py b/src/term_image/renderable/_renderable.py
@@ -17,7 +17,7 @@
 import term_image
 
 from .. import geometry
-from ..ctlseqs import HIDE_CURSOR, SHOW_CURSOR, cursor_down, cursor_forward, cursor_up
+from .._ctlseqs import HIDE_CURSOR, SHOW_CURSOR, cursor_down, cursor_forward, cursor_up
 from ..geometry import Size
 from ..padding import AlignedPadding, ExactPadding, Padding
 from ..utils import arg_value_error_range, get_terminal_size

diff --git a/src/term_image/utils.py b/src/term_image/utils.py
@@ -38,7 +38,7 @@
 
 import term_image
 
-from . import ctlseqs
+from . import _ctlseqs as ctlseqs
 from .exceptions import TermImageWarning
 
 # import logging

diff --git a/src/term_image/widget/urwid.py b/src/term_image/widget/urwid.py
@@ -8,10 +8,10 @@
 
 import urwid
 
-from .. import ctlseqs
+from .. import _ctlseqs as ctlseqs
 
 # These sequences are used during performance-critical operations that occur often
-from ..ctlseqs import BEGIN_SYNCED_UPDATE, END_SYNCED_UPDATE, ESC_b, SGR_NORMAL_b
+from .._ctlseqs import BEGIN_SYNCED_UPDATE, END_SYNCED_UPDATE, ESC_b, SGR_NORMAL_b
 from ..exceptions import UrwidImageError
 from ..image import BaseImage, ITerm2Image, KittyImage, Size, TextImage
 from ..utils import arg_type_error, get_terminal_name_version, lock_tty, write_tty

diff --git a/tests/renderable/test_renderable.py b/tests/renderable/test_renderable.py
@@ -10,7 +10,7 @@
 
 import pytest
 
-from term_image.ctlseqs import HIDE_CURSOR, SHOW_CURSOR
+from term_image._ctlseqs import HIDE_CURSOR, SHOW_CURSOR
 from term_image.geometry import Size
 from term_image.padding import AlignedPadding, ExactPadding, HAlign, VAlign
 from term_image.renderable import (

diff --git a/tests/test_image/common.py b/tests/test_image/common.py
@@ -8,7 +8,7 @@
 from PIL import Image
 
 from term_image import set_cell_ratio
-from term_image.ctlseqs import SGR_BG_DIRECT, SGR_NORMAL
+from term_image._ctlseqs import SGR_BG_DIRECT, SGR_NORMAL
 from term_image.exceptions import StyleError
 from term_image.image.common import _ALPHA_THRESHOLD, GraphicsImage, Size, TextImage
 from term_image.utils import get_fg_bg_colors, get_terminal_size

diff --git a/tests/test_image/test_base.py b/tests/test_image/test_base.py
@@ -11,7 +11,7 @@
 from PIL import Image, UnidentifiedImageError
 
 from term_image import set_cell_ratio
-from term_image.ctlseqs import ESC
+from term_image._ctlseqs import ESC
 from term_image.exceptions import InvalidSizeError, TermImageError
 from term_image.image import BaseImage, BlockImage, ImageIterator, ImageSource, Size
 from term_image.image.common import _ALPHA_THRESHOLD

diff --git a/tests/test_image/test_block.py b/tests/test_image/test_block.py
@@ -1,6 +1,6 @@
 """BlockImage-specific tests"""
 
-from term_image.ctlseqs import SGR_BG_DIRECT, SGR_NORMAL
+from term_image._ctlseqs import SGR_BG_DIRECT, SGR_NORMAL
 from term_image.image import BlockImage
 from term_image.image.common import _ALPHA_THRESHOLD
 

diff --git a/tests/test_image/test_iterm2.py b/tests/test_image/test_iterm2.py
@@ -10,7 +10,7 @@
 from PIL.PngImagePlugin import PngImageFile
 from PIL.WebPImagePlugin import WebPImageFile
 
-from term_image import ctlseqs
+from term_image import _ctlseqs as ctlseqs
 from term_image.exceptions import RenderError, StyleError, TermImageWarning
 from term_image.image import iterm2
 from term_image.image.iterm2 import ANIM, LINES, WHOLE, ITerm2Image

diff --git a/tests/test_image/test_kitty.py b/tests/test_image/test_kitty.py
@@ -7,7 +7,7 @@
 
 import pytest
 
-from term_image import ctlseqs
+from term_image import _ctlseqs as ctlseqs
 from term_image.exceptions import StyleError
 from term_image.image import kitty
 from term_image.image.kitty import LINES, WHOLE, KittyImage

diff --git a/tests/test_iterator.py b/tests/test_iterator.py
@@ -4,7 +4,7 @@
 import pytest
 from PIL import Image
 
-from term_image.ctlseqs import SGR_NORMAL
+from term_image._ctlseqs import SGR_NORMAL
 from term_image.exceptions import TermImageError
 from term_image.image import BlockImage, ImageIterator, Size
 

diff --git a/tests/test_padding.py b/tests/test_padding.py
@@ -2,7 +2,7 @@
 
 import pytest
 
-from term_image.ctlseqs import CURSOR_FORWARD
+from term_image._ctlseqs import CURSOR_FORWARD
 from term_image.geometry import RawSize, Size
 from term_image.padding import (
     AlignedPadding,

diff --git a/tests/widget/urwid/test_main.py b/tests/widget/urwid/test_main.py
@@ -4,7 +4,7 @@
 import urwid
 from PIL import Image
 
-from term_image import ctlseqs
+from term_image import _ctlseqs as ctlseqs
 from term_image.exceptions import RenderError, UrwidImageError
 from term_image.image import (
     BlockImage,

diff --git a/tests/widget/urwid/test_screen.py b/tests/widget/urwid/test_screen.py
@@ -6,7 +6,7 @@
 import urwid
 from PIL import Image
 
-from term_image import ctlseqs
+from term_image import _ctlseqs as ctlseqs
 from term_image.image import BlockImage, ITerm2Image, KittyImage
 from term_image.widget import UrwidImage, UrwidImageCanvas, UrwidImageScreen