omdev 0.0.0.dev126__tar.gz → 0.0.0.dev128__tar.gz

{omdev-0.0.0.dev126/omdev.egg-info → omdev-0.0.0.dev128}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omdev
-Version: 0.0.0.dev126
+Version: 0.0.0.dev128
 Summary: omdev
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,7 +12,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.12
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev126
+Requires-Dist: omlish==0.0.0.dev128
 Provides-Extra: all
 Requires-Dist: black~=24.10; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

{omdev-0.0.0.dev126 → omdev-0.0.0.dev128}/omdev/amalg/amalg.py

@@ -232,13 +232,13 @@ def _is_typing(
         return True
 
     wts = list(tks.ignore_ws(lts))
-    if not (
-            len(wts) >= 5 and
-            wts[0].name == 'NAME' and
-            wts[1].name == 'OP' and wts[1].src == '=' and
-            wts[2].name == 'NAME' and wts[2].src == 'ta' and
-            wts[3].name == 'OP' and wts[3].src == '.'
-    ):
+    if not tks.match_toks(wts, [
+        ('NAME', None),
+        ('OP', '='),
+        ('NAME', 'ta'),
+        ('OP', '.'),
+        (None, None),
+    ]):
         return False
 
     if exclude_newtypes:
@@ -273,6 +273,19 @@ def make_typing(
 ##
 
 
+def is_root_level_if_type_checking_block(lts: Tokens) -> bool:
+    return tks.match_toks(tks.ignore_ws(lts, keep=['INDENT']), [
+        ('NAME', 'if'),
+        ('NAME', 'ta'),
+        ('OP', '.'),
+        ('NAME', 'TYPE_CHECKING'),
+        ('OP', ':'),
+    ])
+
+
+##
+
+
 @dc.dataclass(frozen=True, kw_only=True)
 class SrcFile:
     path: str
@@ -352,6 +365,13 @@ def make_src_file(
                 for ml in mls
             ])
 
+        elif is_root_level_if_type_checking_block(line):
+            while True:
+                nl = cls[i]
+                if nl and nl[0].name != 'INDENT':
+                    break
+                i += 1
+
         else:
             ctls.append(line)
 

{omdev-0.0.0.dev126 → omdev-0.0.0.dev128}/omdev/cexts/_distutils/sysconfig.py

@@ -73,7 +73,7 @@ def get_python_version():
     Return a string containing the major and minor Python version, leaving off the patchlevel.  Sample return values
     could be '1.5' or '2.2'.
     """
-    return '%d.%d' % sys.version_info[:2]
+    return '%d.%d' % sys.version_info[:2]  # noqa
 
 
 def get_python_inc(plat_specific=0, prefix=None):
@@ -193,9 +193,9 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
 
     if prefix is None:
         if standard_lib:
-            prefix = plat_specific and BASE_EXEC_PREFIX or BASE_PREFIX
+            prefix = plat_specific and BASE_EXEC_PREFIX or BASE_PREFIX  # noqa
         else:
-            prefix = plat_specific and EXEC_PREFIX or PREFIX
+            prefix = plat_specific and EXEC_PREFIX or PREFIX  # noqa
 
     if os.name == 'posix':
         if plat_specific or standard_lib:

{omdev-0.0.0.dev126 → omdev-0.0.0.dev128}/omdev/cli/clicli.py

@@ -21,11 +21,11 @@ class CliCli(ap.Cli):
 
     #
 
-    @ap.command(name='version')
+    @ap.command(name='version', aliases=['ver'])
     def print_version(self) -> None:
         print(__about__.__version__)
 
-    @ap.command(name='revision')
+    @ap.command(name='revision', aliases=['rev'])
     def print_revision(self) -> None:
         print(__about__.__revision__)
 

{omdev-0.0.0.dev126 → omdev-0.0.0.dev128}/omdev/scripts/interp.py

@@ -1316,7 +1316,7 @@ class StandardLogFormatter(logging.Formatter):
             return ct.strftime(datefmt)  # noqa
         else:
             t = ct.strftime('%Y-%m-%d %H:%M:%S')
-            return '%s.%03d' % (t, record.msecs)
+            return '%s.%03d' % (t, record.msecs)  # noqa
 
 
 ##

{omdev-0.0.0.dev126 → omdev-0.0.0.dev128}/omdev/scripts/pyproject.py

@@ -2841,7 +2841,7 @@ class StandardLogFormatter(logging.Formatter):
             return ct.strftime(datefmt)  # noqa
         else:
             t = ct.strftime('%Y-%m-%d %H:%M:%S')
-            return '%s.%03d' % (t, record.msecs)
+            return '%s.%03d' % (t, record.msecs)  # noqa
 
 
 ##

{omdev-0.0.0.dev126 → omdev-0.0.0.dev128}/omdev/tokens.py

@@ -29,8 +29,16 @@ def is_ws(tok: 'trt.Token') -> bool:
     return tok.name in WS_NAMES
 
 
-def ignore_ws(toks: ta.Iterable['trt.Token']) -> ta.Iterable['trt.Token']:
-    return (t for t in toks if not is_ws(t))
+def ignore_ws(
+        toks: ta.Iterable['trt.Token'],
+        *,
+        keep: ta.Container[str] = (),
+) -> ta.Iterable['trt.Token']:
+    return (
+        t
+        for t in toks
+        if t.name in keep or t.name not in WS_NAMES
+    )
 
 
 ##
@@ -46,3 +54,23 @@ def join_toks(ts: Tokens) -> str:
 
 def join_lines(ls: ta.Iterable[Tokens]) -> str:
     return ''.join(map(join_toks, ls))
+
+
+##
+
+
+def match_toks(
+        ts: ta.Iterable['trt.Token'],
+        pat: ta.Sequence[tuple[str | None, str | None]],
+) -> bool:
+    it = iter(ts)
+    for pn, ps in pat:
+        try:
+            t = next(it)
+        except StopIteration:
+            return False
+        if pn is not None and t.name != pn:
+            return False
+        if ps is not None and t.src != ps:
+            return False
+    return True

{omdev-0.0.0.dev126 → omdev-0.0.0.dev128/omdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omdev
-Version: 0.0.0.dev126
+Version: 0.0.0.dev128
 Summary: omdev
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,7 +12,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.12
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev126
+Requires-Dist: omlish==0.0.0.dev128
 Provides-Extra: all
 Requires-Dist: black~=24.10; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

{omdev-0.0.0.dev126 → omdev-0.0.0.dev128}/omdev.egg-info/requires.txt

@@ -1,4 +1,4 @@
-omlish==0.0.0.dev126
+omlish==0.0.0.dev128
 
 [all]
 black~=24.10

{omdev-0.0.0.dev126 → omdev-0.0.0.dev128}/pyproject.toml

@@ -12,7 +12,7 @@ authors = [
 urls = {source = 'https://github.com/wrmsr/omlish'}
 license = {text = 'BSD-3-Clause'}
 requires-python = '>=3.12'
-version = '0.0.0.dev126'
+version = '0.0.0.dev128'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -22,7 +22,7 @@ classifiers = [
 ]
 description = 'omdev'
 dependencies = [
-    'omlish == 0.0.0.dev126',
+    'omlish == 0.0.0.dev128',
 ]
 
 [project.optional-dependencies]