omlish 0.0.0.dev101__tar.gz → 0.0.0.dev103__tar.gz

{omlish-0.0.0.dev101/omlish.egg-info → omlish-0.0.0.dev103}/PKG-INFO

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

{omlish-0.0.0.dev101 → omlish-0.0.0.dev103}/omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev101'
-__revision__ = '44c6ff624e1a09a5024ea5cbc8a6cdcb1f54f013'
+__version__ = '0.0.0.dev103'
+__revision__ = 'e402b674aa19d5ca77d769f4290c26e35eb24c22'
 
 
 #

{omlish-0.0.0.dev101 → omlish-0.0.0.dev103}/omlish/diag/pycharm/pycharm.py

@@ -1,7 +1,9 @@
 import dataclasses as dc
+import json
 import os.path
 import plistlib
 import re
+import shutil
 import subprocess
 import sys
 import typing as ta
@@ -43,6 +45,26 @@ def read_darwin_pycharm_info_plist() -> ta.Mapping[str, ta.Any] | None:
     return root
 
 
+#
+
+
+UBUNTU_PYCHARM_HOME = '/snap/pycharm-professional/current'
+
+
+def read_ubuntu_pycharm_product_info() -> ta.Mapping[str, ta.Any] | None:
+    json_file = os.path.join(UBUNTU_PYCHARM_HOME, 'product-info.json')
+    if not os.path.isfile(json_file):
+        return None
+
+    with open(json_file) as f:
+        root = json.load(f)
+
+    return root
+
+
+#
+
+
 @lang.cached_function
 def get_pycharm_version() -> str | None:
     if sys.platform == 'darwin':
@@ -54,6 +76,17 @@ def get_pycharm_version() -> str | None:
         check.state(ver.startswith('PY-'))
         return ver[3:]
 
+    elif sys.platform == 'linux':
+        if shutil.which('lsb_release') is not None:
+            lsb_id = subprocess.check_output(['lsb_release', '-is']).decode().strip()
+            if lsb_id == 'Ubuntu':
+                pi = read_ubuntu_pycharm_product_info()
+                if pi is not None:
+                    ver = check.non_empty_str(pi['buildNumber'])
+                    return ver
+
+        return None
+
     else:
         return None
 

{omlish-0.0.0.dev101 → omlish-0.0.0.dev103}/omlish/lite/cached.py

@@ -1,7 +1,11 @@
 import functools
+import typing as ta
 
 
-class cached_nullary:  # noqa
+T = ta.TypeVar('T')
+
+
+class _cached_nullary:  # noqa
     def __init__(self, fn):
         super().__init__()
         self._fn = fn
@@ -16,3 +20,7 @@ class cached_nullary:  # noqa
     def __get__(self, instance, owner):  # noqa
         bound = instance.__dict__[self._fn.__name__] = self.__class__(self._fn.__get__(instance, owner))
         return bound
+
+
+def cached_nullary(fn: ta.Callable[..., T]) -> ta.Callable[..., T]:
+    return _cached_nullary(fn)

omlish-0.0.0.dev103/omlish/lite/contextmanagers.py

@@ -0,0 +1,52 @@
+# ruff: noqa: UP007
+import contextlib
+import typing as ta
+
+from .check import check_not_none
+from .check import check_state
+
+
+T = ta.TypeVar('T')
+ExitStackedT = ta.TypeVar('ExitStackedT', bound='ExitStacked')
+
+
+##
+
+
+class ExitStacked:
+    _exit_stack: ta.Optional[contextlib.ExitStack] = None
+
+    def __enter__(self: ExitStackedT) -> ExitStackedT:
+        check_state(self._exit_stack is None)
+        es = self._exit_stack = contextlib.ExitStack()
+        es.__enter__()
+        return self
+
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        if (es := self._exit_stack) is None:
+            return None
+        return es.__exit__(exc_type, exc_val, exc_tb)
+
+    def _enter_context(self, cm: ta.ContextManager[T]) -> T:
+        es = check_not_none(self._exit_stack)
+        return es.enter_context(cm)
+
+
+##
+
+
+@contextlib.contextmanager
+def attr_setting(obj, attr, val, *, default=None):  # noqa
+    not_set = object()
+    orig = getattr(obj, attr, not_set)
+    try:
+        setattr(obj, attr, val)
+        if orig is not not_set:
+            yield orig
+        else:
+            yield default
+    finally:
+        if orig is not_set:
+            delattr(obj, attr)
+        else:
+            setattr(obj, attr, orig)

{omlish-0.0.0.dev101 → omlish-0.0.0.dev103}/omlish/lite/marshal.py

@@ -150,7 +150,7 @@ class DataclassObjMarshaler(ObjMarshaler):
         return {k: m.marshal(getattr(o, k)) for k, m in self.fs.items()}
 
     def unmarshal(self, o: ta.Any) -> ta.Any:
-        return self.ty(**{k: self.fs[k].unmarshal(v) for k, v in o.items() if self.nonstrict or k in self.fs})
+        return self.ty(**{k: self.fs[k].unmarshal(v) for k, v in o.items() if not self.nonstrict or k in self.fs})
 
 
 @dc.dataclass(frozen=True)

{omlish-0.0.0.dev101 → omlish-0.0.0.dev103}/omlish/lite/pidfile.py

@@ -30,7 +30,7 @@ class Pidfile:
         return self
 
     def __exit__(self, exc_type, exc_val, exc_tb):
-        if self._f is not None:
+        if hasattr(self, '_f'):
             self._f.close()
             del self._f
 

{omlish-0.0.0.dev101 → omlish-0.0.0.dev103}/omlish/lite/subprocesses.py

@@ -110,3 +110,21 @@ def subprocess_try_output(
 def subprocess_try_output_str(*args: str, **kwargs: ta.Any) -> ta.Optional[str]:
     out = subprocess_try_output(*args, **kwargs)
     return out.decode().strip() if out is not None else None
+
+
+##
+
+
+def subprocess_close(
+        proc: subprocess.Popen,
+        timeout: ta.Optional[float] = None,
+) -> None:
+    # TODO: terminate, sleep, kill
+    if proc.stdout:
+        proc.stdout.close()
+    if proc.stderr:
+        proc.stderr.close()
+    if proc.stdin:
+        proc.stdin.close()
+
+    proc.wait(timeout)

{omlish-0.0.0.dev101 → omlish-0.0.0.dev103/omlish.egg-info}/PKG-INFO

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

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

omlish-0.0.0.dev101/omlish/lite/contextmanagers.py

@@ -1,18 +0,0 @@
-import contextlib
-
-
-@contextlib.contextmanager
-def attr_setting(obj, attr, val, *, default=None):  # noqa
-    not_set = object()
-    orig = getattr(obj, attr, not_set)
-    try:
-        setattr(obj, attr, val)
-        if orig is not not_set:
-            yield orig
-        else:
-            yield default
-    finally:
-        if orig is not_set:
-            delattr(obj, attr)
-        else:
-            setattr(obj, attr, orig)