update imports to reflect new subpackage

apparebit · Oct 30, 2023 · 64869f6 · 64869f6
1 parent 2ea859c
commit 64869f6
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 21 deletions.
diff --git a/demicode/display.py b/demicode/display.py
@@ -14,9 +14,9 @@
 from typing import Callable, cast
 
 from .benchmark import Probe
-from .codepoint import CodePoint, CodePointSequence
-from .model import Age, General_Category, Presentation
-from .ucd import UnicodeCharacterDatabase
+from .db.codepoint import CodePoint, CodePointSequence
+from .db.model import Age, General_Category, Presentation
+from .db.ucd import UnicodeCharacterDatabase
 from .ui.control import Action, read_line_action
 from .ui.render import Padding, Renderer
 from . import __version__

diff --git a/demicode/selection.py b/demicode/selection.py
@@ -1,6 +1,6 @@
 """Code points selected by human judgement."""
 
-from .codepoint import CodePoint, CodePointSequence
+from .db.codepoint import CodePoint, CodePointSequence
 
 __all__ = (
     'ARROWS',

diff --git a/demicode/statistics.py b/demicode/statistics.py
@@ -2,8 +2,8 @@
 from pathlib import Path
 from typing import cast, NamedTuple
 
-import demicode.model as model
-from .model import (
+import demicode.db.model as model
+from .db.model import (
     Age,
     BinaryProperty,
     Block,
@@ -18,9 +18,9 @@
     Script,
     to_property_name,
 )
-from .ucd import OverlapCounter, UnicodeCharacterDatabase
+from .db.ucd import OverlapCounter, UnicodeCharacterDatabase
+from .db.version import Version
 from .ui.render import Renderer
-from .version import Version
 
 
 _PROPERTIES: tuple[PropertyId, ...] = (

diff --git a/demicode/tool.py b/demicode/tool.py
@@ -15,15 +15,15 @@
 from typing import Callable
 
 from .benchmark import Probe, report_page_rendering, TerminalSizeChecker
-from .codegen import generate_code
-from .codepoint import CodePoint, CodePointSequence
+from .db.codegen import generate_code
+from .db.codepoint import CodePoint, CodePointSequence
+from .db.ucd import UnicodeCharacterDatabase
+from .db.version import VersionError
 from .display import display
 from .selection import *
 from .statistics import collect_statistics, show_statistics
-from .ucd import UnicodeCharacterDatabase
 from .ui.control import read_key_action, read_line_action
 from .ui.render import KeyPressReader, Renderer, Style
-from .version import VersionError
 from . import __version__
 
 

diff --git a/test/test_codepoints.py b/test/test_codepoints.py
@@ -1,6 +1,6 @@
 import unittest
 
-from demicode.codepoint import (
+from demicode.db.codepoint import (
     CodePoint,
     CodePointRange,
     codepoints_to_ranges,

diff --git a/test/test_mirror.py b/test/test_mirror.py
@@ -1,8 +1,8 @@
 from pathlib import Path
 import unittest
 
-from demicode.mirror import Mirror
-from demicode.version import Version, VersionError
+from demicode.db.mirror import Mirror
+from demicode.db.version import Version, VersionError
 
 
 UCD_PATH = Path(__file__).parents[1] / 'ucd'

diff --git a/test/test_model.py b/test/test_model.py
@@ -1,7 +1,7 @@
 import unittest
 
-from demicode.codepoint import CodePoint, CodePointRange
-from demicode.version import Version
+from demicode.db.codepoint import CodePoint, CodePointRange
+from demicode.db.version import Version
 
 
 POINT_DATA = (

diff --git a/test/test_ucd.py b/test/test_ucd.py
@@ -2,8 +2,8 @@
 from itertools import chain
 import unittest
 
-from demicode.codepoint import CodePoint, CodePointSequence
-from demicode.model import (
+from demicode.db.codepoint import CodePoint, CodePointSequence
+from demicode.db.model import (
     Age,
     Block,
     BinaryProperty,
@@ -17,8 +17,8 @@
     PropertyId,
     Script,
 )
-from demicode.ucd import UnicodeCharacterDatabase
-from demicode.version import Version
+from demicode.db.ucd import UnicodeCharacterDatabase
+from demicode.db.version import Version
 
 from test.grapheme_clusters import GRAPHEME_CLUSTER_BREAKS