omlish 0.0.0.dev77__py3-none-any.whl → 0.0.0.dev78__py3-none-any.whl

omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev77'
-__revision__ = '8b46b6eef1d8ddc8c6ccd65f76b7d9f3d0759919'
+__version__ = '0.0.0.dev78'
+__revision__ = 'ab358221dace7193463b9b1a32f06ed9f09cc0f5'
 
 
 #

omlish/diag/_pycharm/runhack.py

@@ -1190,6 +1190,18 @@ class HackRunner:
         self._is_debug = is_debug
         self._is_enabled = is_enabled
 
+    @_cached_nullary
+    def _debug_formatter(self):
+        try:
+            import pprint  # noqa
+        except ImportError:
+            return repr
+
+        def df(arg):
+            return pprint.pformat(arg, sort_dicts=False)
+
+        return df
+
     def _debug(self, arg):
         if not self._is_debug:
             return
@@ -1197,12 +1209,7 @@ class HackRunner:
         if isinstance(arg, str):
             s = arg
         else:
-            try:
-                import pprint  # noqa
-            except ImportError:
-                s = repr(arg)
-            else:
-                s = pprint.pformat(arg, sort_dicts=False)
+            s = self._debug_formatter()(arg)
 
         print(f'{_DEBUG_PREFIX}: {s}', file=sys.stderr)
 
@@ -1343,23 +1350,23 @@ def _install_pth_file(
 ) -> bool:
     import site
     lib_dir = site.getsitepackages()[0]
-    verbose and print(f'{lib_dir=}')
+    verbose and print(f'{lib_dir=}', file=sys.stderr)
 
     pth_file = os.path.join(lib_dir, file_name)
-    verbose and print(f'{pth_file=}')
+    verbose and print(f'{pth_file=}', file=sys.stderr)
     if not force and os.path.isfile(pth_file):
-        verbose and print('pth_file exists, exiting')
+        verbose and print('pth_file exists, exiting', file=sys.stderr)
         return False
 
     if not editable:
         if module_name is None:
             module_name = '_' + file_name.removesuffix('.pth').replace('-', '_')
-        verbose and print(f'{module_name=}')
+        verbose and print(f'{module_name=}', file=sys.stderr)
 
         mod_file = os.path.join(lib_dir, module_name + '.py')
-        verbose and print(f'{mod_file=}')
+        verbose and print(f'{mod_file=}', file=sys.stderr)
         if not force and os.path.isfile(mod_file):
-            verbose and print('mod_file exists, exiting')
+            verbose and print('mod_file exists, exiting', file=sys.stderr)
             return False
 
         import inspect
@@ -1368,20 +1375,20 @@ def _install_pth_file(
     else:
         if module_name is None:
             module_name = __package__ + '.runhack'
-        verbose and print(f'{module_name=}')
+        verbose and print(f'{module_name=}', file=sys.stderr)
 
         mod_file = mod_src = None  # type: ignore
 
     pth_src = _build_pth_file_src(module_name)
-    verbose and print(f'{pth_src=}')
+    verbose and print(f'{pth_src=}', file=sys.stderr)
 
     if not dry_run:
         if mod_file is not None:
-            verbose and print(f'writing {mod_file}')
+            verbose and print(f'writing {mod_file}', file=sys.stderr)
             with open(mod_file, 'w') as f:
                 f.write(mod_src)  # type: ignore
 
-        verbose and print(f'writing {pth_file}')
+        verbose and print(f'writing {pth_file}', file=sys.stderr)
         with open(pth_file, 'w') as f:
             f.write(pth_src)
 

omlish/lite/check.py

@@ -38,3 +38,20 @@ def check_non_empty_str(v: ta.Optional[str]) -> str:
 def check_state(v: bool, msg: str = 'Illegal state') -> None:
     if not v:
         raise ValueError(msg)
+
+
+def check_equal(l: T, r: T) -> T:
+    if l != r:
+        raise ValueError(l, r)
+    return l
+
+
+def check_not_equal(l: T, r: T) -> T:
+    if l == r:
+        raise ValueError(l, r)
+    return l
+
+
+def check_single(vs: ta.Iterable[T]) -> T:
+    [v] = vs
+    return v

omlish/{io.py → lite/io.py}

@@ -1,31 +1,31 @@
-import dataclasses as dc
+# ruff: noqa: UP007
 import io
 import typing as ta
 
-from . import check
+from .check import check_isinstance
+from .check import check_not_none
+from .strings import attr_repr
 
 
-@dc.dataclass(frozen=True)
-class DelimitingBufferError(Exception):
-    buffer: 'DelimitingBuffer'
-
-
-class ClosedDelimitingBufferError(DelimitingBufferError):
-    pass
+class DelimitingBuffer:
+    """
+    https://github.com/python-trio/trio/issues/796 :|
+    """
 
+    #
 
-class FullDelimitingBufferError(DelimitingBufferError):
-    pass
+    class Error(Exception):
+        def __init__(self, buffer: 'DelimitingBuffer') -> None:
+            super().__init__(buffer)
+            self.buffer = buffer
 
+        def __repr__(self) -> str:
+            return attr_repr(self, 'buffer')
 
-class IncompleteDelimitingBufferError(DelimitingBufferError):
-    pass
+    class ClosedError(Error):
+        pass
 
-
-class DelimitingBuffer:
-    """
-    https://github.com/python-trio/trio/issues/796 :|
-    """
+    #
 
     DEFAULT_DELIMITERS: bytes = b'\n'
 
@@ -34,19 +34,17 @@ class DelimitingBuffer:
             delimiters: ta.Iterable[int] = DEFAULT_DELIMITERS,
             *,
             keep_ends: bool = False,
-            max_size: int | None = None,
-            on_full: ta.Literal['raise', 'yield'] = 'raise',
-            on_incomplete: ta.Literal['raise', 'yield'] = 'yield',
+            max_size: ta.Optional[int] = None,
     ) -> None:
         super().__init__()
 
-        self._delimiters = frozenset(check.isinstance(d, int) for d in delimiters)
+        self._delimiters = frozenset(check_isinstance(d, int) for d in delimiters)
         self._keep_ends = keep_ends
         self._max_size = max_size
-        self._on_full = on_full
-        self._on_incomplete = on_incomplete
 
-        self._buf: io.BytesIO | None = io.BytesIO()
+        self._buf: ta.Optional[io.BytesIO] = io.BytesIO()
+
+    #
 
     @property
     def is_closed(self) -> bool:
@@ -54,15 +52,15 @@ class DelimitingBuffer:
 
     def tell(self) -> int:
         if (buf := self._buf) is None:
-            raise ClosedDelimitingBufferError(self)
+            raise self.ClosedError(self)
         return buf.tell()
 
     def peek(self) -> bytes:
         if (buf := self._buf) is None:
-            raise ClosedDelimitingBufferError(self)
+            raise self.ClosedError(self)
         return buf.getvalue()
 
-    def _find_delim(self, data: bytes | bytearray, i: int) -> int | None:
+    def _find_delim(self, data: ta.Union[bytes, bytearray], i: int) -> ta.Optional[int]:
         r = None  # type: int | None
         for d in self._delimiters:
             if (p := data.find(d, i)) >= 0:
@@ -71,7 +69,7 @@ class DelimitingBuffer:
         return r
 
     def _append_and_reset(self, chunk: bytes) -> bytes:
-        buf = check.not_none(self._buf)
+        buf = check_not_none(self._buf)
         if not buf.tell():
             return chunk
 
@@ -80,22 +78,18 @@ class DelimitingBuffer:
         buf.seek(0)
         return ret
 
-    def feed(self, data: bytes | bytearray) -> ta.Generator[bytes, None, None]:
+    class Incomplete(ta.NamedTuple):
+        b: bytes
+
+    def feed(self, data: ta.Union[bytes, bytearray]) -> ta.Generator[ta.Union[bytes, Incomplete], None, None]:
         if (buf := self._buf) is None:
-            raise ClosedDelimitingBufferError(self)
+            raise self.ClosedError(self)
 
         if not data:
             self._buf = None
 
             if buf.tell():
-                if self._on_incomplete == 'raise':
-                    raise IncompleteDelimitingBufferError(self)
-
-                elif self._on_incomplete == 'yield':
-                    yield buf.getvalue()
-
-                else:
-                    raise ValueError(f'Unknown on_incomplete value: {self._on_incomplete!r}')
+                yield self.Incomplete(buf.getvalue())
 
             return
 
@@ -128,15 +122,6 @@ class DelimitingBuffer:
                 buf.write(data[i:])
                 return
 
-            if self._on_full == 'raise':
-                raise FullDelimitingBufferError(self)
-
-            elif self._on_full == 'yield':
-                p = i + remaining_buf_capacity
-
-                yield self._append_and_reset(data[i:p])
-
-                i = p
-
-            else:
-                raise ValueError(f'Unknown on_full value: {self._on_full!r}')
+            p = i + remaining_buf_capacity
+            yield self.Incomplete(self._append_and_reset(data[i:p]))
+            i = p

omlish/lite/strings.py

@@ -1,5 +1,13 @@
-def camel_case(name: str) -> str:
-    return ''.join(map(str.capitalize, name.split('_')))  # noqa
+import typing as ta
+
+
+def camel_case(name: str, lower: bool = False) -> str:
+    if not name:
+        return ''
+    s = ''.join(map(str.capitalize, name.split('_')))  # noqa
+    if lower:
+        s = s[0].lower() + s[1:]
+    return s
 
 
 def snake_case(name: str) -> str:
@@ -23,3 +31,7 @@ def is_sunder(name: str) -> bool:
         name[-2:-1] != '_' and
         len(name) > 2
     )
+
+
+def attr_repr(obj: ta.Any, *attrs: str) -> str:
+    return f'{type(obj).__name__}({", ".join(f"{attr}={getattr(obj, attr)!r}" for attr in attrs)})'

{omlish-0.0.0.dev77.dist-info → omlish-0.0.0.dev78.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omlish
-Version: 0.0.0.dev77
+Version: 0.0.0.dev78
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause

{omlish-0.0.0.dev77.dist-info → omlish-0.0.0.dev78.dist-info}/RECORD

@@ -1,5 +1,5 @@
 omlish/.manifests.json,sha256=ucaSu1XcJPryi-AqINUejkVDeJAFk7Bp5ar5_tJTgME,1692
-omlish/__about__.py,sha256=i1Q9Y1vMY4lpwFfOBqcBVeNNdDLETm1ZG2fP6UX9CXE,3420
+omlish/__about__.py,sha256=V-NjYdq77UjSL6Wh4-iy3PPEIixpdndH7m4d-i_05EE,3420
 omlish/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/argparse.py,sha256=Dc73G8lyoQBLvXhMYUbzQUh4SJu_OTvKUXjSUxq_ang,7499
 omlish/c3.py,sha256=4vogWgwPb8TbNS2KkZxpoWbwjj7MuHG2lQG-hdtkvjI,8062
@@ -11,7 +11,6 @@ omlish/dynamic.py,sha256=35C_cCX_Vq2HrHzGk5T-zbrMvmUdiIiwDzDNixczoDo,6541
 omlish/fnpairs.py,sha256=Sl8CMFNyDS-1JYAjSWqnT5FmUm9Lj6o7FxSRo7g4jww,10875
 omlish/fnpipes.py,sha256=AJkgz9nvRRm7oqw7ZgYyz21klu276LWi54oYCLg-vOg,2196
 omlish/genmachine.py,sha256=LCMiqvK32dAWtrlB6lKw9tXdQFiXC8rRdk4TMQYIroU,1603
-omlish/io.py,sha256=4_0naIRniQ_xGhCW44xkk3sKqgddCbtIjbs72SGqK9g,3679
 omlish/iterators.py,sha256=GGLC7RIT86uXMjhIIIqnff_Iu5SI_b9rXYywYGFyzmo,7292
 omlish/libc.py,sha256=8r7Ejyhttk9ruCfBkxNTrlzir5WPbDE2vmY7VPlceMA,15362
 omlish/matchfns.py,sha256=I1IlQGfEyk_AcFSy6ulVS3utC-uwyZM2YfUXYHc9Bw0,6152
@@ -159,7 +158,7 @@ omlish/diag/ps.py,sha256=1JWxZen3fVG-20R6ZZ8BtO_gpzw_5bhHZiKdoHkgxoU,1004
 omlish/diag/pydevd.py,sha256=Fsx9rfCOnwLD6RLBqH0uAdtq75rbNeBAQfiDvIBd3e0,7295
 omlish/diag/threads.py,sha256=1-x02VCDZ407gfbtXm1pWK-ubqhqfePm9PMqkHCVoqk,3642
 omlish/diag/_pycharm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-omlish/diag/_pycharm/runhack.py,sha256=SRL3ay-bGPNzyjZ7dya8T_2ucBhlK9WMKUrLI1-_YTQ,34678
+omlish/diag/_pycharm/runhack.py,sha256=eJlaUXIcFzAjOop_793RwNS_KF9NmhLv0i22xRVVeo0,34951
 omlish/diag/pycharm/__init__.py,sha256=sT-ub7flKeCCbM_i32z9-eGV8hgGJ45hwdcqtGDkVRY,153
 omlish/diag/pycharm/cli.py,sha256=7SRh6yj8S5YGda4bq9BD4Kzwtgg4_Wa-K202ReZN2iI,1011
 omlish/diag/pycharm/pycharm.py,sha256=g-IfF8FBH93o6k_KDrLy8kIiFSLe3n39I2URipfFy0Q,3115
@@ -278,15 +277,16 @@ omlish/lifecycles/states.py,sha256=zqMOU2ZU-MDNnWuwauM3_anIAiXM8LoBDElDEraptFg,1
 omlish/lifecycles/transitions.py,sha256=qQtFby-h4VzbvgaUqT2NnbNumlcOx9FVVADP9t83xj4,1939
 omlish/lite/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
 omlish/lite/cached.py,sha256=dUm647FbIsoxWT23XUFM51F7i-C2Buxr5b5zzgbCtQI,546
-omlish/lite/check.py,sha256=B0VnyBSWI5qipidkwnU-BP43S9E-UOgp4WUM17pVpHc,750
+omlish/lite/check.py,sha256=ouJme9tkzWXKymm_xZDK4mngdYSkxDrok6CSegvf-1w,1015
 omlish/lite/contextmanagers.py,sha256=HnQJiyrOmSvTL22XRJrFl5CLpCyHD9fsntEUAr9G-60,427
+omlish/lite/io.py,sha256=6qixpFyLwCVRi44Np49xknvwZEtCz1yYMgsawE_Gh0Y,3125
 omlish/lite/json.py,sha256=7-02Ny4fq-6YAu5ynvqoijhuYXWpLmfCI19GUeZnb1c,740
 omlish/lite/logs.py,sha256=vkFkSX0Izb2P-NNMqqNLSec0BzeLOtHoQWgdXwQuDPU,6007
 omlish/lite/marshal.py,sha256=kZtfIiFfmxEi8ZKne3fT0R8g8kLmJ-Q5nq4kOvwhiqk,8656
 omlish/lite/reflect.py,sha256=9QYJwdINraq1JNMEgvoqeSlVvRRgOXpxAkpgX8EgRXc,1307
 omlish/lite/runtime.py,sha256=VUhmNQvwf8QzkWSKj4Q0ReieJA_PzHaJNRBivfTseow,452
 omlish/lite/secrets.py,sha256=3Mz3V2jf__XU9qNHcH56sBSw95L3U2UPL24bjvobG0c,816
-omlish/lite/strings.py,sha256=9dO_A6EkhcTZ2xmOUGSOMT-mx9BnoOzYu1-ocSrDJaA,670
+omlish/lite/strings.py,sha256=GFkkp-q6sgO06EACyp33oiyCQQKAbpGMnVMFHZE5KP8,955
 omlish/lite/subprocesses.py,sha256=KuGV3ImehMjCUK0JoV3pUtG_7o5wei1lRDn9HxzByAg,3063
 omlish/logs/__init__.py,sha256=FbOyAW-lGH8gyBlSVArwljdYAU6RnwZLI5LwAfuNnrk,438
 omlish/logs/_abc.py,sha256=UgrCUQVUi_PvT3p1CEkb3P74CFrFcZq2AFby3GEUv9M,5974
@@ -439,9 +439,9 @@ omlish/text/delimit.py,sha256=ubPXcXQmtbOVrUsNh5gH1mDq5H-n1y2R4cPL5_DQf68,4928
 omlish/text/glyphsplit.py,sha256=Ug-dPRO7x-OrNNr8g1y6DotSZ2KH0S-VcOmUobwa4B0,3296
 omlish/text/indent.py,sha256=6Jj6TFY9unaPa4xPzrnZemJ-fHsV53IamP93XGjSUHs,1274
 omlish/text/parts.py,sha256=7vPF1aTZdvLVYJ4EwBZVzRSy8XB3YqPd7JwEnNGGAOo,6495
-omlish-0.0.0.dev77.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev77.dist-info/METADATA,sha256=VlK72KOPqQ5bEM1S_-WWEjL40m4-gBNAOS_1vO1Ckpc,4167
-omlish-0.0.0.dev77.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-omlish-0.0.0.dev77.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
-omlish-0.0.0.dev77.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev77.dist-info/RECORD,,
+omlish-0.0.0.dev78.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omlish-0.0.0.dev78.dist-info/METADATA,sha256=Ux9SWMjTdMbbivRndYxzrL5D3GOcd0ZHsaXHwwyhDWU,4167
+omlish-0.0.0.dev78.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+omlish-0.0.0.dev78.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
+omlish-0.0.0.dev78.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
+omlish-0.0.0.dev78.dist-info/RECORD,,