omdev 0.0.0.dev125__py3-none-any.whl → 0.0.0.dev127__py3-none-any.whl

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/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/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/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/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/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.dev125.dist-info → omdev-0.0.0.dev127.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omdev
-Version: 0.0.0.dev125
+Version: 0.0.0.dev127
 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.dev125
+Requires-Dist: omlish==0.0.0.dev127
 Provides-Extra: all
 Requires-Dist: black~=24.10; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

{omdev-0.0.0.dev125.dist-info → omdev-0.0.0.dev127.dist-info}/RECORD

@@ -10,11 +10,11 @@ omdev/imgur.py,sha256=il12R3t19tALolteYCZywvcdQUEOcgvPyUYgWtKiqt4,2993
 omdev/pip.py,sha256=7cZ_IOpekQvgPm_gKnX3Pr8xjqUid50PPScTlZCYVlM,2118
 omdev/revisions.py,sha256=U657hf4zeEN32y3g4CzqCAodx_HlfkHj2cIIKALNFDo,5009
 omdev/secrets.py,sha256=bcquaBIDKqX4UIKOzUuKrX7nxVCenj67rRHIMIrd9bk,540
-omdev/tokens.py,sha256=Y-w-UdeWjHrVoP90-MZ_5KsNuwgC59AzEb8xfUPZVag,799
+omdev/tokens.py,sha256=eCppK7BtlgAK_AmfO-Or_B-x85tqmu0HVla8d2gvB3I,1333
 omdev/wheelfile.py,sha256=yfupGcGkbFlmzGzKU64k_vmOKpaKnUlDWxeGn2KdekU,10005
 omdev/amalg/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/amalg/__main__.py,sha256=h94M-VqZ3AFBU2a8zOsjeKK7RF6uINhTHl6OiGbVMgw,163
-omdev/amalg/amalg.py,sha256=Tyz7ZIc3IL0902ySNsNBFvZ5SAGwi3qEX7xk1RPQejM,15414
+omdev/amalg/amalg.py,sha256=qU5eZR5U1Kgz6r8ihgfPwH572KVjZzwUiLhWWcvU2Jc,15782
 omdev/antlr/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/antlr/consts.py,sha256=8pR6r0m0P3hAiyiAoJZ-nptd2GYbZ98mxwPL9cpaRuw,279
 omdev/antlr/gen.py,sha256=QnPyVWUrJYqHoOc3XsXA8fJdoiwAj6pyUwdG-DVrIeA,2953
@@ -50,7 +50,7 @@ omdev/cexts/_distutils/extension.py,sha256=CAxie5k3eCD-k-OaBPYYsyOFbgcWgx0oipA2D
 omdev/cexts/_distutils/file_util.py,sha256=glpfHGEDZKMS_VAIgr3YlExtQfNP4agxOrn3WenjE7U,7804
 omdev/cexts/_distutils/modified.py,sha256=OI4guORuIv16fyFTS-B_eaPSELttGPVeZCYgjR357Ec,1723
 omdev/cexts/_distutils/spawn.py,sha256=ROud2VB_tyktPGq6ldsOyFTGIsvSvYAQf_ioWQh0XH0,3435
-omdev/cexts/_distutils/sysconfig.py,sha256=NYfkHHcQRkgVfVhNEexd2DdYhJmZ1BIaT3BhPd7hk0c,12630
+omdev/cexts/_distutils/sysconfig.py,sha256=lVMnczs-4vSqzWeHzDo6ImRW-uAAR0ZIGVJwnyhfjp8,12654
 omdev/cexts/_distutils/util.py,sha256=k4t8w-8VWLVzFh5LvfSpygkssSfrU7LaMT6xIMQQkQw,6413
 omdev/cexts/_distutils/version.py,sha256=LEjpZjn2HGFEJElZrklb2NSALhr9wWi1uXfVf_5WLRY,12509
 omdev/cexts/_distutils/compilers/__init__.py,sha256=amL_zrFlba0lHIvpqDne9uhqhLemA7hBZFX-MHL7R3c,68
@@ -60,7 +60,7 @@ omdev/cexts/_distutils/compilers/unixccompiler.py,sha256=o1h8QuyupLntv4F21_XjzAZ
 omdev/cli/__init__.py,sha256=V_l6VP1SZMlJbO-8CJwSuO9TThOy2S_oaPepNYgIrbE,37
 omdev/cli/__main__.py,sha256=mOJpgc07o0r5luQ1DlX4tk2PqZkgmbwPbdzJ3KmtjgQ,138
 omdev/cli/_pathhack.py,sha256=kxqb2kHap68Lkh8b211rDbcgj06hidBiAKA3f9posyc,2119
-omdev/cli/clicli.py,sha256=MdjqYzzh4WfSApKynBXso3HyUNU0G4nMZ7uf_hro4_8,3470
+omdev/cli/clicli.py,sha256=NhTYaCQx3K_Y8UOZZYqCa3lqxkCB41XgE2FpR_PT7Gc,3504
 omdev/cli/install.py,sha256=C-W171YlIHt4Cfok-nWSMbHwWhqF_PFqq2HixFttYx8,4460
 omdev/cli/main.py,sha256=p00ZoNIOlQW6GjyzryoIweQnC-a8tDx59S8EQYJ4uLY,7028
 omdev/cli/managers.py,sha256=BV98_n30Jj63OJrFgRoVZRfICxMLXEZKoEn4rMj9LV4,1160
@@ -122,8 +122,8 @@ omdev/scripts/bumpversion.py,sha256=Kn7fo73Hs8uJh3Hi3EIyLOlzLPWAC6dwuD_lZ3cIzuY,
 omdev/scripts/execrss.py,sha256=mR0G0wERBYtQmVIn63lCIIFb5zkCM6X_XOENDFYDBKc,651
 omdev/scripts/exectime.py,sha256=sFb376GflU6s9gNX-2-we8hgH6w5MuQNS9g6i4SqJIo,610
 omdev/scripts/importtrace.py,sha256=oa7CtcWJVMNDbyIEiRHej6ICfABfErMeo4_haIqe18Q,14041
-omdev/scripts/interp.py,sha256=QUXS5l228HsigOCHb8HkvRpUK3M6ptcxBcBgoJqhEzc,73108
-omdev/scripts/pyproject.py,sha256=amDvpyKfAuC72oJXyFDd33APUn3R5MxeTH1nmAgxIuo,174424
+omdev/scripts/interp.py,sha256=u_rdez9SARWzziYAApEDF9ub7l31xWzJRqepTcQVd-A,73116
+omdev/scripts/pyproject.py,sha256=rnrkzAoK1u9VrRAeLNGY0smAKk3EInhii3bceKQAZBY,174432
 omdev/scripts/slowcat.py,sha256=lssv4yrgJHiWfOiHkUut2p8E8Tq32zB-ujXESQxFFHY,2728
 omdev/scripts/tmpexec.py,sha256=WTYcf56Tj2qjYV14AWmV8SfT0u6Y8eIU6cKgQRvEK3c,1442
 omdev/toml/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
@@ -143,9 +143,9 @@ omdev/tools/sqlrepl.py,sha256=tmFZh80-xsGM62dyQ7_UGLebChrj7IHbIPYBWDJMgVk,5741
 omdev/tools/pawk/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/tools/pawk/__main__.py,sha256=VCqeRVnqT1RPEoIrqHFSu4PXVMg4YEgF4qCQm90-eRI,66
 omdev/tools/pawk/pawk.py,sha256=Eckymn22GfychCQcQi96BFqRo_LmiJ-EPhC8TTUJdB4,11446
-omdev-0.0.0.dev125.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omdev-0.0.0.dev125.dist-info/METADATA,sha256=ClcyK0PgJQeaCz2MJ7mQH3RdOTh4He-oMlzV0MXEfew,1760
-omdev-0.0.0.dev125.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-omdev-0.0.0.dev125.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
-omdev-0.0.0.dev125.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
-omdev-0.0.0.dev125.dist-info/RECORD,,
+omdev-0.0.0.dev127.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omdev-0.0.0.dev127.dist-info/METADATA,sha256=8c3Z02TiglVJ00bDrSn97uuS_dy2PM5m9dWQGfL6GVo,1760
+omdev-0.0.0.dev127.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+omdev-0.0.0.dev127.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
+omdev-0.0.0.dev127.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
+omdev-0.0.0.dev127.dist-info/RECORD,,