dekshell 0.2.59__py3-none-any.whl → 0.2.61__py3-none-any.whl

dekshell/core/contexts/methods.py

@@ -32,13 +32,14 @@ from dektools.download import download_from_http
 from dektools.ps.process import process_print_all, process_print_detail, process_detail, process_query, process_username
 from dektools.time import now
 from dektools.str import shlex_split, shlex_quote, str_split, split_table_line
+from dektools.py import get_inner_vars
 from dektools.format import format_duration
 from dektools.shell import shell_wrapper, is_user_admin, shell_timeout, shell_retry, shell_command
 from dektools.match import GeneralMatcher, glob2re, glob_compile, glob_match
 from dektools.cmd.git import git_parse_modules, git_clean_dir, git_fetch_min, git_remove_tag, git_latest_tag, \
     git_list_remotes, git_apply, git_head
 from ...utils.beep import sound_notify
-from ..markers.base.core import MarkerBase, get_inner_vars
+from ..markers.base.core import MarkerBase
 from ..markers.invoke import InvokeMarker, GotoMarker, ImportMarker
 from ..redirect import search_bin_by_path_tree
 

dekshell/core/contexts/properties.py

@@ -13,12 +13,12 @@ from dektools.module import ModuleProxy
 from dektools.time import DateTime
 from dektools.file import read_text
 from dektools.env import is_on_cicd
+from dektools.py import get_inner_vars
 from dektools.ps.process import process_attrs
 from dektools.context.utils import Method, MethodSimple, AttrProxy
 from dektools.web.url import Url
 from ...utils.serializer import serializer
 from ..redirect import shell_name
-from ..markers.base.core import get_inner_vars
 
 current_shell = shutil.which(shell_name, path=get_paths()['scripts'])
 current_os = extra_platforms_current_os()

dekshell/core/markers/base/core.py

@@ -7,39 +7,6 @@ from dektools.typing import NoneType
 from . import MarkerBase, TransformerMarker, ExitException, QuitContextException
 
 
-def get_inner_vars(*var_name_list, full=True):
-    def walk(attr):
-        depth = 1
-        while True:
-            try:
-                frame = sys._getframe(depth)
-            except ValueError:
-                return
-            scope = getattr(frame, attr)
-            for i, name in enumerate(var_name_list):
-                if result[i] is unset:
-                    if name in scope:
-                        result[i] = scope[name]
-            if not list_unset():
-                break
-            depth += 1
-
-    def list_unset():
-        return [var_name_list[i] for i, x in enumerate(result) if x is unset]
-
-    unset = object()
-    result = [unset] * len(var_name_list)
-    walk('f_globals')
-    if full and list_unset():
-        walk('f_locals')
-    lu = list_unset()
-    if lu:
-        raise ValueError(f"Can't find: {lu}")
-    if len(result) == 1:
-        return result[0]
-    return tuple(result)
-
-
 class MarkerContext:
     def __init__(self, parent=None):
         self.variables = parent.variables.derive() if parent else MapChainContext()

dekshell/core/markers/function.py

@@ -1,6 +1,7 @@
 from dektools.dict import assign_list
+from dektools.py import get_inner_vars
 from .base import MarkerBase, MarkerWithEnd, MarkerNoTranslator, cmd_call_prefix, cmd_call_prefix_simple
-from .base.core import QuitContext, get_inner_vars
+from .base.core import QuitContext
 
 
 class CallMarker(MarkerNoTranslator):

dekshell/core/markers/invoke.py

@@ -1,8 +1,8 @@
 import os
 from dektools.file import normal_path
+from dektools.py import get_inner_vars
 from ...utils.cmd import pack_context_full
 from .base import MarkerBase
-from .base.core import get_inner_vars
 
 
 class MarkerInvokerBase(MarkerBase):

{dekshell-0.2.59.dist-info → dekshell-0.2.61.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dekshell
-Version: 0.2.59
+Version: 0.2.61
 Author-Email: sanzenwin <sanzenwin@gmail.com>
 License: MIT
 Requires-Python: >=3.8

{dekshell-0.2.59.dist-info → dekshell-0.2.61.dist-info}/RECORD

@@ -1,16 +1,16 @@
-dekshell-0.2.59.dist-info/METADATA,sha256=br2cBov9G__-AASyHVzfrPdLquqrQZHAeBNLp89ecQs,573
-dekshell-0.2.59.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
-dekshell-0.2.59.dist-info/entry_points.txt,sha256=d-kbfULiUTZWIBBsrQF3J_-wESncF-4K2rwHT08grlI,75
+dekshell-0.2.61.dist-info/METADATA,sha256=MySJ832MXEErb3mnNOrjE0wCw6eYmHB45WvGnfmvq3I,573
+dekshell-0.2.61.dist-info/WHEEL,sha256=9P2ygRxDrTJz3gsagc0Z96ukrxjr-LFBGOgv3AuKlCA,90
+dekshell-0.2.61.dist-info/entry_points.txt,sha256=d-kbfULiUTZWIBBsrQF3J_-wESncF-4K2rwHT08grlI,75
 dekshell/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dekshell/click/__entry__.py,sha256=CMuxUzXoEe4TcHFZwv-MNFwHnu1HSZCDpXFpqQ814uM,42
 dekshell/click/__init__.py,sha256=r-AHdO9CEEVvTN20-8Jozr6Zh8XSv_BnktYRwrlhtrE,2046
 dekshell/core/__init__.py,sha256=isDEKwk1odLdvTQNCILCtVNBuXp1uFVPz_uTDNihkVU,5547
 dekshell/core/contexts/__init__.py,sha256=oBZhmXtSoOBgZPAHu6wiMCCW-yIdkC5mqSXqbvKYUy4,490
-dekshell/core/contexts/methods.py,sha256=OngRFg2FTG21RjVvd2kguHbYTSLbmvfYQRof4xk7KNI,12339
-dekshell/core/contexts/properties.py,sha256=TQonN3T_K2cB2uakq_DVVB13B-IFwoM6t2ZkL_OMekw,3365
+dekshell/core/contexts/methods.py,sha256=hHdVBOqD3tGUI0oNEJNP_E6Ndg_H8fzJBLMp7c-wGko,12362
+dekshell/core/contexts/properties.py,sha256=1FjP3a_2VkI7gx5-WVIn3nwHBZh_st85gXBI9-Y0PSQ,3357
 dekshell/core/markers/__init__.py,sha256=1oq4wlBOJV56hsshPe0ZZZMvoItCV2Xs2RN08HTrbiY,2255
 dekshell/core/markers/base/__init__.py,sha256=CHD9vb8yGjnALimCwZJ2refbPB7zAE4FgQKLoRwzLrE,18037
-dekshell/core/markers/base/core.py,sha256=5TYAg7JWX58669RBUOMgJxCUMuOARPDL7GENNtNAYls,12558
+dekshell/core/markers/base/core.py,sha256=fBiyO8bxr2NC65FBc5myxkNqLvS9evRJRwxCHYaUlU4,11642
 dekshell/core/markers/base/shell.py,sha256=fiFsTUDI8pSDDUCk834OI4ajri2qNWFJkLVhmUk2uAs,484
 dekshell/core/markers/commands.py,sha256=mDRj4dSfKbDaZ_ts4lPXd6wftvGFI4VKkRoIzxV7otA,1696
 dekshell/core/markers/comment.py,sha256=rBzxcyvTv7qgy5jc0NWT4pi5M7xEf9Wwa2mv96kJ0gc,1030
@@ -20,10 +20,10 @@ dekshell/core/markers/empty.py,sha256=pWKsHlrp6uXWU6blqOs0IgN_3kYm1OmDQiKGPERabA
 dekshell/core/markers/env.py,sha256=hU6irauFrvsUgK9j6jifosiMn0b6mt3aOf5t9oKhxS4,1160
 dekshell/core/markers/exec.py,sha256=BUNSgZh5WyE7wY6M-5zPvebdnWrdkQKSlDEhSgrY8gk,3395
 dekshell/core/markers/for_.py,sha256=wQnK3-o0dQl4A2wx8xgs6V2dzgEjEbnt4MML2fh2x8U,2148
-dekshell/core/markers/function.py,sha256=j8Cz4ouBQi_0dT6Q6pfJie-1rfIZuSIcWzGBlsKCSd8,3850
+dekshell/core/markers/function.py,sha256=eUobnt-pcZhHzpp3JRkJn2ie8KO_VEubYDeoatEkOzw,3873
 dekshell/core/markers/if_.py,sha256=UqEnR0X9bKO7hEKol3MJNWXvP7fuJAGt8zwk3xlBCuk,1118
 dekshell/core/markers/input.py,sha256=94SWaeLnwtxRdIn9Ck0IxMZL6vOXVCedUmsp5IPAwWo,1188
-dekshell/core/markers/invoke.py,sha256=ESL2DE9DTaq33AnrXpvEudp1qtoeZFKOhLL12OQpcs0,1975
+dekshell/core/markers/invoke.py,sha256=Tei83qB5wjMFPeVMaqTxLzsHhU5c1NEE2E8rkPPf69U,1976
 dekshell/core/markers/pip_.py,sha256=F_l7sKxAdPBPsEfRTD8wo5cJLy3N9FGQHLD2nv29yiM,638
 dekshell/core/markers/redirect.py,sha256=-w_qhdaHa1hIi-LjCmXpaYKZWrTitAiSawjEf8qjYt4,1989
 dekshell/core/markers/shell.py,sha256=43BDAAzMdmgZmemkW5buh_w4LL1GDGw-s9fNZo6vhag,1929
@@ -37,4 +37,4 @@ dekshell/utils/cmd.py,sha256=K9FbXgHcGFchHA58xI0_t4YK4yb8XkWbxsNoztYRx3Y,518
 dekshell/utils/pkg.py,sha256=TgYqRqawoJfjkxt6UAHnp9ttmpjuHiWRFbqxADOS1VE,1337
 dekshell/utils/serializer.py,sha256=aIdF2Wzo-qHmIshv46jn1XD0X66vQ1JFdU-g3ZFbH2w,386
 dekshell/utils/shell.py,sha256=0NoA2-SOOMinbmZZipwzL-npBbzPOdWEfdPVYqq5G5g,92
-dekshell-0.2.59.dist-info/RECORD,,
+dekshell-0.2.61.dist-info/RECORD,,

{dekshell-0.2.59.dist-info → dekshell-0.2.61.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: pdm-backend (2.4.4)
+Generator: pdm-backend (2.4.5)
 Root-Is-Purelib: true
 Tag: py3-none-any