omlish 0.0.0.dev77__tar.gz → 0.0.0.dev78__tar.gz

{omlish-0.0.0.dev77/omlish.egg-info → omlish-0.0.0.dev78}/PKG-INFO

@@ -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 → omlish-0.0.0.dev78}/omlish/__about__.py

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

{omlish-0.0.0.dev77 → omlish-0.0.0.dev78}/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-0.0.0.dev77 → omlish-0.0.0.dev78}/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-0.0.0.dev77/omlish → omlish-0.0.0.dev78/omlish/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-0.0.0.dev77 → omlish-0.0.0.dev78}/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 → omlish-0.0.0.dev78/omlish.egg-info}/PKG-INFO

@@ -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 → omlish-0.0.0.dev78}/omlish.egg-info/SOURCES.txt

@@ -15,7 +15,6 @@ omlish/dynamic.py
 omlish/fnpairs.py
 omlish/fnpipes.py
 omlish/genmachine.py
-omlish/io.py
 omlish/iterators.py
 omlish/libc.py
 omlish/matchfns.py
@@ -290,6 +289,7 @@ omlish/lite/__init__.py
 omlish/lite/cached.py
 omlish/lite/check.py
 omlish/lite/contextmanagers.py
+omlish/lite/io.py
 omlish/lite/json.py
 omlish/lite/logs.py
 omlish/lite/marshal.py

{omlish-0.0.0.dev77 → omlish-0.0.0.dev78}/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.dev77'
+version = '0.0.0.dev78'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',