Move format_helper into typemap.type_eval

msullivan · msullivan · commit bcae1cd75c1c · 2026-03-18T15:51:44.000-07:00
diff --git a/tests/test_call.py b/tests/test_call.py
@@ -11,7 +11,7 @@
     Iter,
 )
 
-from . import format_helper
+from typemap.type_eval import format_helper
 
 
 def func[*T, K: BaseTypedDict](
diff --git a/tests/test_dataclass_like.py b/tests/test_dataclass_like.py
@@ -132,7 +132,7 @@ class Hero(Model):
 import textwrap
 
 from typemap.type_eval import eval_typing
-from . import format_helper
+from typemap.type_eval import format_helper
 
 
 @pytest.mark.xfail(reason="UpateClass currently drops things")
diff --git a/tests/test_fastapilike_1.py b/tests/test_fastapilike_1.py
@@ -22,7 +22,7 @@
     Params,
 )
 
-from . import format_helper
+from typemap.type_eval import format_helper
 
 
 class PropQuals(enum.Enum):
diff --git a/tests/test_fastapilike_2.py b/tests/test_fastapilike_2.py
@@ -219,7 +219,7 @@ class Hero:
 import textwrap
 
 from typemap.type_eval import eval_typing
-from . import format_helper
+from typemap.type_eval import format_helper
 
 
 def test_fastapi_like_0():
diff --git a/tests/test_qblike.py b/tests/test_qblike.py
@@ -18,7 +18,7 @@
     GetArg,
 )
 
-from . import format_helper
+from typemap.type_eval import format_helper
 
 
 class Property[T]:
diff --git a/tests/test_qblike_2.py b/tests/test_qblike_2.py
@@ -5,7 +5,7 @@
 from typemap.type_eval import eval_call, eval_typing
 import typemap_extensions as typing
 
-from . import format_helper
+from typemap.type_eval import format_helper
 
 
 # Begin PEP section: Prisma-style ORMs
diff --git a/tests/test_qblike_3.py b/tests/test_qblike_3.py
@@ -31,7 +31,7 @@
     UpdateClass,
 )
 
-from . import format_helper
+from typemap.type_eval import format_helper
 
 
 """
diff --git a/tests/test_schemalike.py b/tests/test_schemalike.py
@@ -14,7 +14,7 @@
     Concat,
 )
 
-from . import format_helper
+from typemap.type_eval import format_helper
 
 
 class Schema:
diff --git a/tests/test_ts_utility.py b/tests/test_ts_utility.py
@@ -11,7 +11,7 @@
 import typemap_extensions as typing
 from typemap.type_eval import eval_typing
 
-from . import format_helper
+from typemap.type_eval import format_helper
 
 
 # The "Todo" type from the TypeScript utility-types examples
diff --git a/tests/test_type_dir.py b/tests/test_type_dir.py
@@ -16,7 +16,7 @@
     Uppercase,
 )
 
-from . import format_helper
+from typemap.type_eval import format_helper
 
 type OrGotcha[K] = K | Literal['gotcha!']
 
diff --git a/tests/test_type_eval.py b/tests/test_type_eval.py
@@ -52,7 +52,7 @@
     Uppercase,
 )
 
-from . import format_helper
+from typemap.type_eval import format_helper
 
 type A[T] = T | None | Literal[False]
 type B = A[int]
diff --git a/typemap/type_eval/format_helper.py b/typemap/type_eval/format_helper.py
@@ -41,6 +41,6 @@ def format_meth(name, meth):
 
 
 def format_class(cls):
-    from typemap.type_eval import flatten_class
+    from . import flatten_class
 
     return format_class_basic(flatten_class(cls))

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`Iter,`
`12`	`12`	`)`
`13`	`13`
`14`		`-from . import format_helper`
	`14`	`+from typemap.type_eval import format_helper`
`15`	`15`
`16`	`16`
`17`	`17`	`def func[*T, K: BaseTypedDict](`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`Params,`
`23`	`23`	`)`
`24`	`24`
`25`		`-from . import format_helper`
	`25`	`+from typemap.type_eval import format_helper`
`26`	`26`
`27`	`27`
`28`	`28`	`class PropQuals(enum.Enum):`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`GetArg,`
`19`	`19`	`)`
`20`	`20`
`21`		`-from . import format_helper`
	`21`	`+from typemap.type_eval import format_helper`
`22`	`22`
`23`	`23`
`24`	`24`	`class Property[T]:`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@`
`31`	`31`	`UpdateClass,`
`32`	`32`	`)`
`33`	`33`
`34`		`-from . import format_helper`
	`34`	`+from typemap.type_eval import format_helper`
`35`	`35`
`36`	`36`
`37`	`37`	`"""`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`Concat,`
`15`	`15`	`)`
`16`	`16`
`17`		`-from . import format_helper`
	`17`	`+from typemap.type_eval import format_helper`
`18`	`18`
`19`	`19`
`20`	`20`	`class Schema:`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`Uppercase,`
`17`	`17`	`)`
`18`	`18`
`19`		`-from . import format_helper`
	`19`	`+from typemap.type_eval import format_helper`
`20`	`20`
`21`	`21`	`type OrGotcha[K] = K \| Literal['gotcha!']`
`22`	`22`