omlish 0.0.0.dev457__py3-none-any.whl → 0.0.0.dev458__py3-none-any.whl

omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev457'
-__revision__ = '64cce982d49f06067f317ce043a99f89db92e3ae'
+__version__ = '0.0.0.dev458'
+__revision__ = '03501d1fe0a74615b61159ca12f11879ce2029b3'
 
 
 #

omlish/diag/pydevd.py

@@ -31,7 +31,6 @@ import os
 import sys
 import tempfile
 import textwrap
-import threading
 import types
 import typing as ta
 
@@ -255,23 +254,23 @@ def maybe_reexec(
         bootstrap_path = os.path.join(tmpdir, 'bootstrap.py')
         with open(bootstrap_path, 'w') as f:
             f.write(textwrap.dedent(f"""
-            import sys
-            old_paths = set(sys.path)
-            for new_path in {sys.path!r}:
-                if new_path not in old_paths:
-                    sys.path.insert(0, new_path)
-
-            _stderr_write = sys.stderr.write
-            def stderr_write(*args, **kwargs):
-                code = sys._getframe(1).f_code
-                if code is not None and code.co_filename and code.co_filename.endswith('/pydev_log.py'):
-                    return
-                _stderr_write(*args, **kwargs)
-            sys.stderr.write = stderr_write
-
-            sys.argv = {args[1:]!r}
-            import runpy
-            runpy.run_path({args[1]!r}, run_name='__main__')
+                import sys
+                old_paths = set(sys.path)
+                for new_path in {sys.path!r}:
+                    if new_path not in old_paths:
+                        sys.path.insert(0, new_path)
+
+                _stderr_write = sys.stderr.write
+                def stderr_write(*args, **kwargs):
+                    code = sys._getframe(1).f_code
+                    if code is not None and code.co_filename and code.co_filename.endswith('/pydev_log.py'):
+                        return
+                    _stderr_write(*args, **kwargs)
+                sys.stderr.write = stderr_write
+
+                sys.argv = {args[1:]!r}
+                import runpy
+                runpy.run_path({args[1]!r}, run_name='__main__')
             """))
         args = [args[0], bootstrap_path]
 
@@ -284,29 +283,14 @@ def debug_unhandled_exception(exc_info: ta.Any = None) -> None:
 
     try:
         import pydevd
-        from pydevd import pydevd_tracing
 
     except ImportError:
         return
 
-    exctype, value, traceback = exc_info
-    frames = []
-    while traceback:
-        frames.append(traceback.tb_frame)
-        traceback = traceback.tb_next
-
-    thread = threading.current_thread()
-    frames_by_id = {id(frame): frame for frame in frames}
-    frame = frames[-1]
-    exception = (exctype, value, traceback)
-
-    if hasattr(thread, 'additional_info'):
-        thread.additional_info.pydev_message = 'server exception'
-    try:
-        debugger = pydevd.debugger  # noqa
-    except AttributeError:
-        debugger = pydevd.get_global_debugger()  # noqa
+    et, e, tb = exc_info
 
-    pydevd_tracing.SetTrace(None)
+    while tb.tb_next is not None:
+        tb = tb.tb_next
+    original_frame = tb.tb_frame
 
-    debugger.stop_on_unhandled_exception(thread, frame, frames_by_id, exception)
+    pydevd.settrace(stop_at_frame=original_frame, suspend=True)

omlish/term/confirm.py

@@ -15,7 +15,7 @@ def confirm_action(
         stdin = sys.stdin
     if not stdin.isatty():
         raise OSError(f'stdin {stdin!r} is not a tty')
-    # FIXME: we want to make sure we only run on a tty, but we als want input()'s readline goodies..
+    # FIXME: we want to make sure we only run on a tty, but we also want input()'s readline goodies..
     if stdin is not sys.stdin:
         raise RuntimeError('Unsupported stdin')
 
@@ -24,15 +24,15 @@ def confirm_action(
     if not stdout.isatty():
         raise OSError(f'stdout {stdout!r} is not a tty')
 
-    while True:
-        if message and not message[-1].isspace():
-            if '\n' in message:
-                prefix = message + '\n\n'
-            else:
-                prefix = message + ' '
+    if message:
+        if '\n' in message:
+            prefix = message + '\n\n'
         else:
-            prefix = ''
+            prefix = message + ' '
+    else:
+        prefix = ''
 
+    while True:
         c = input(f'{prefix}(y/n): ').lower().strip()
 
         if c == 'y':

{omlish-0.0.0.dev457.dist-info → omlish-0.0.0.dev458.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omlish
-Version: 0.0.0.dev457
+Version: 0.0.0.dev458
 Summary: omlish
 Author: wrmsr
 License-Expression: BSD-3-Clause

{omlish-0.0.0.dev457.dist-info → omlish-0.0.0.dev458.dist-info}/RECORD

@@ -1,5 +1,5 @@
 omlish/.omlish-manifests.json,sha256=FLw7xkPiSXuImZgqSP8BwrEib2R1doSzUPLUkc-QUIA,8410
-omlish/__about__.py,sha256=7wUq7VUXvYMZngckEy8GopODX5t4PieoLpMrovKdKsI,3613
+omlish/__about__.py,sha256=JFsg8-NJ-oUZhhnc3zS3hNbni2_vxB5zayG1vEx5f2c,3613
 omlish/__init__.py,sha256=SsyiITTuK0v74XpKV8dqNaCmjOlan1JZKrHQv5rWKPA,253
 omlish/c3.py,sha256=ZNIMl1kwg3qdei4DiUrJPQe5M81S1e76N-GuNSwLBAE,8683
 omlish/cached.py,sha256=MLap_p0rdGoDIMVhXVHm1tsbcWobJF0OanoodV03Ju8,542
@@ -205,7 +205,7 @@ omlish/diag/procfs.py,sha256=eeB3L9UpNBpAfsax3U6OczayYboPlFzOGplqlQ4gBNY,9700
 omlish/diag/procstats.py,sha256=EJEe2Zc58ykBoTfqMXro7H52aQa_pd6uC2hsIPFceso,825
 omlish/diag/ps.py,sha256=MEpMU6fbkh0bSWrOHh_okOa0JDTUSUQUVSYBdh1TGvE,1672
 omlish/diag/pycharm.py,sha256=_WVmPm1E66cBtR4ukgUAaApe_3rX9Cv3sQRP5PL37P8,5013
-omlish/diag/pydevd.py,sha256=P8izkeCEJWXFLqOWS6X8qUH3rlcfhiE07ZJOPGa5xYU,8203
+omlish/diag/pydevd.py,sha256=QfpOrVAHV7-PT3X8kLquXM7gpC-41oxIM4NtKhTdywE,7700
 omlish/diag/threads.py,sha256=sjtlTl41wxssoVCDkBB6xeLF-9kJEK3eA6hmSFWJSQA,3643
 omlish/diag/timers.py,sha256=cxX3GgjTIjBx9DI4pzCCO5Hfqb1TM3uo22yim7kjfRU,3831
 omlish/diag/_pycharm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -758,7 +758,7 @@ omlish/subprocesses/wrap.py,sha256=AhGV8rsnaVUMQCFYKkrjj35fs3O-VJLZC1hZ14dz3C8,7
 omlish/term/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/term/codes.py,sha256=6_g4wwXP4z9koC9oEW3jSEuw27mQRf43ngD5RA-Qu2s,6390
 omlish/term/coloring.py,sha256=5lV7E2fyFDixAfm4tM5MFV9vreW5RM94AgUHB9hKaVE,2598
-omlish/term/confirm.py,sha256=M3DAyyPO2yREhSXOAWF-KQcLTHRRZCVsg2nrIKT8kHI,1111
+omlish/term/confirm.py,sha256=0Qoo-MFBWw26khMMHv92tFXFHNB9GOubfdPLi48KkkY,1054
 omlish/term/progressbar.py,sha256=nCnTX1dUNCGle9FzzeTBuoxQaellErOQkyBsKVrGG1I,3679
 omlish/term/vt100/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/term/vt100/c.py,sha256=93HARU6Dd1rVF-n8cAyXqkEqleYLcofuLgSUNd6-GbU,3537
@@ -826,9 +826,9 @@ omlish/typedvalues/marshal.py,sha256=2xqX6JllhtGpmeYkU7C-qzgU__0x-vd6CzYbAsocQlc
 omlish/typedvalues/of_.py,sha256=UXkxSj504WI2UrFlqdZJbu2hyDwBhL7XVrc2qdR02GQ,1309
 omlish/typedvalues/reflect.py,sha256=PAvKW6T4cW7u--iX80w3HWwZUS3SmIZ2_lQjT65uAyk,1026
 omlish/typedvalues/values.py,sha256=ym46I-q2QJ_6l4UlERqv3yj87R-kp8nCKMRph0xQ3UA,1307
-omlish-0.0.0.dev457.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev457.dist-info/METADATA,sha256=h9XOPiW_Qp1WAj_ufmcGrj-r6mDLA89_nNzZJPP52W8,19003
-omlish-0.0.0.dev457.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-omlish-0.0.0.dev457.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
-omlish-0.0.0.dev457.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev457.dist-info/RECORD,,
+omlish-0.0.0.dev458.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omlish-0.0.0.dev458.dist-info/METADATA,sha256=1ECWQXj_iU52Kb0BHM0TatXwVbcHx5q-eFY8mHzDYbU,19003
+omlish-0.0.0.dev458.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+omlish-0.0.0.dev458.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
+omlish-0.0.0.dev458.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
+omlish-0.0.0.dev458.dist-info/RECORD,,