omdev 0.0.0.dev416__py3-none-any.whl → 0.0.0.dev500__py3-none-any.whl

omdev/py/srcheaders.py

@@ -4,7 +4,7 @@ import typing as ta
 
 from omlish.lite.check import check
 
-from ..tokens import all as tks
+from .tokens import all as tks
 
 
 ##

omdev/{tokens → py/tokens}/utils.py

@@ -27,6 +27,7 @@ def is_ws(tok: Token) -> bool:
 def ignore_ws(
         toks: ta.Iterable[Token],
         *,
+        drop_nl: bool = False,
         keep: ta.Container[str] = (),
 ) -> ta.Iterable[Token]:
     if isinstance(keep, str):
@@ -34,7 +35,7 @@ def ignore_ws(
     return (
         t
         for t in toks
-        if t.name in keep or t.name not in WS_NAMES
+        if t.name in keep or (t.name not in WS_NAMES and not (drop_nl and t.name == 'NL'))
     )
 
 

omdev/py/tools/importscan.py

@@ -23,8 +23,8 @@ import sys
 import typing as ta
 
 from omlish import check
-from omlish import concurrent as cu
 from omlish import lang
+from omlish.concurrent import all as conc
 
 from ...cli import CliModule
 
@@ -163,7 +163,7 @@ def run(
         specs.append(spec)
 
     out: dict[str, Item] = {}
-    with cu.new_executor(num_threads) as ex:
+    with conc.new_executor(num_threads) as ex:
         futs = [ex.submit(run_one, spec, **kwargs) for spec in specs]
         for fut in futs:
             item = fut.result()

omdev/py/tools/mkrelimp.py

@@ -1,19 +1,18 @@
 import argparse
 import itertools
-import logging
 import os.path
 import typing as ta
 
 from omlish.logs import all as logs
 
 from ...cli import CliModule
-from ...tokens import all as tks
+from ..tokens import all as tks
 
 
 T = ta.TypeVar('T')
 
 
-log = logging.getLogger(__name__)
+log = logs.get_module_logger(globals())
 
 
 ##
@@ -32,7 +31,7 @@ def indexfn(
     return -1
 
 
-def interleave(sep: T, it: ta.Iterable[T]) -> ta.Iterable[T]:
+def interleave(sep: T, it: ta.Iterable[T]) -> ta.Iterator[T]:
     for i, e in enumerate(it):
         if i > 0:
             yield sep