dekshell 0.2.24__py3-none-any.whl → 0.2.26__py3-none-any.whl

dekshell/click/__entry__.py

@@ -3,3 +3,7 @@ from . import app
 
 def main():
     app()
+
+
+if __name__ == '__main__':
+    main()

dekshell/core/__init__.py

@@ -37,11 +37,11 @@ def shell_command_file(filepath, **kwargs):
     filepath = normal_path(filepath, unix=True)
     with codecs.open(filepath, encoding='utf-8') as f:
         kwargs['source'] = dict(desc=filepath)
-        kwargs['context'] = (kwargs.get('context') or {}) | dict(
+        kwargs['context'] = {**(kwargs.get('context') or {}), **dict(
             fp=filepath,
             fpp=os.path.dirname(filepath),
             fpy=seek_py_module_path(filepath),
-        )
+        )}
         return shell_command_batch(f.read(), **kwargs)
 
 
@@ -56,9 +56,10 @@ default_configs = {
     'descper': dict(desc_begin_per=True, desc_took_per=True),
     'source': lambda src: dict(source=dict(desc=src))
 }
-default_configs |= {
-    'notify': default_configs['beep'] | default_configs['deschead'],
-    'notifyper': default_configs['beep'] | default_configs['deschead'] | default_configs['descper'],
+default_configs = {
+    **default_configs,
+    'notify': {**default_configs['beep'], **default_configs['deschead']},
+    'notifyper': {**default_configs['beep'], **default_configs['deschead'], **default_configs['descper']},
 }
 
 
@@ -114,7 +115,7 @@ def shell_command_batch_core(
         generate_markers(*(marker or []), **(plugin_kwargs or {})),
         shell_exec, shell_cmd
     )
-    context_final = get_all_context() | (context or {})
+    context_final = {**get_all_context(), **(context or {})}
     tz = get_tz(tz)
     ts_begin = time.time()
     commands, ln = _get_commands(commands)

dekshell/core/contexts/methods.py

@@ -4,6 +4,7 @@ import sys
 import time
 import tempfile
 import getpass
+import operator
 from importlib import import_module
 from functools import reduce
 from itertools import chain
@@ -11,7 +12,7 @@ from pathlib import Path
 from io import BytesIO, StringIO
 from dektools.file import sure_dir, write_file, read_text, remove_path, sure_parent_dir, normal_path, \
     format_path_desc, read_file, split_ext, path_ext, clear_dir, copy_recurse_ignore, path_is_empty, \
-    read_lines, seek_py_module_path, come_real_path, status_of_dir, diff_of_dir, \
+    read_lines, seek_py_module_path, come_real_path, status_of_dir, diff_of_dir, path_parent, \
     split_file, combine_split_files, remove_split_files, meta_split_file, tree, iglob, \
     where, where_list, which, which_list
 from dektools.hash import hash_file
@@ -41,13 +42,6 @@ def _is_true(x):
     return x not in {'false', '0', 'none', 'null', '', ' ', False, 0, None, b'', b'\0'}
 
 
-def _parent_dir(path, num=1):
-    cursor = path
-    for i in range(int(num)):
-        cursor = os.path.dirname(cursor)
-    return cursor
-
-
 def _list_dir_one(path, file):
     path = normal_path(path)
     for item in os.listdir(path):
@@ -223,9 +217,9 @@ default_methods = {
     'io': _io,
     'reduce': reduce,
     'chain': chain,
-    'echo': lambda *x, **y: print(*x, **dict(flush=True) | y),
-    'echos': lambda *x, **y: print(*x, **dict(end='', flush=True) | y),
-    'echox': lambda *x, **y: print(*x, **dict(file=sys.stderr, flush=True) | y),
+    'echo': lambda *x, **y: print(*x, **{**dict(flush=True), **y}),
+    'echos': lambda *x, **y: print(*x, **{**dict(end='', flush=True), **y}),
+    'echox': lambda *x, **y: print(*x, **{**dict(file=sys.stderr, flush=True), **y}),
     'pprint': pprint,
     'o2s': obj2str,
     'now': now,
@@ -245,7 +239,7 @@ default_methods = {
         'tree': _tree,
         'exists': os.path.exists,
         'empty': path_is_empty,
-        'parent': _parent_dir,
+        'parent': path_parent,
         'abs': normal_path,
         'rel': os.path.relpath,
         'cr': come_real_path,
@@ -306,11 +300,18 @@ default_methods = {
 
     'me': lambda x: x,
     'first': lambda x, default=None: next(iter(x), default),
+
     'true': lambda x=True: _is_true(x),
     'false': lambda x=False: not _is_true(x),
 
-    'equal': lambda x, y: x == y,
-    'notequal': lambda x, y: x != y,
+    'not_': lambda x: not x,
+    'or_': lambda *x: reduce(operator.or_, x),
+    'and_': lambda *x: reduce(operator.and_, x),
+    'eq': lambda x, y: x == y,
+    'neq': lambda x, y: x != y,
+    'is_': lambda x, y: x is y,
+    'nis': lambda x, y: x is not y,
+
     'beep': lambda x=True: sound_notify(x),
 
     'invoke': lambda __placeholder__filepath, *args, **kwargs: InvokeMarker.execute_file(

dekshell/core/markers/base/__init__.py

@@ -235,7 +235,7 @@ class MarkerBase:
     def eval(context, s, v=None):
         if not s:
             return None
-        return eval(s, context.variables_full() | (v or {}))
+        return eval(s, {**context.variables_full(), **(v or {})})
 
     @classmethod
     def eval_mixin(cls, context, expression, translate=True):
@@ -278,7 +278,7 @@ class MarkerBase:
 
     @staticmethod
     def eval_lines(context, s, v=None):
-        globals_ = context.variables_full() | (v or {})
+        globals_ = {**context.variables_full(), **(v or {})}
         locals_ = {}
         exec(s, globals_, locals_)
         return locals_
@@ -402,7 +402,7 @@ class MarkerShellBase(MarkerBase):
 
     @classmethod
     def execute_core(cls, context, command, marker_node, marker_set, kwargs=None):
-        kwargs = (marker_node.payload or {}) | (kwargs or {})
+        kwargs = {**(marker_node.payload or {}), **(kwargs or {})}
         return marker_set.shell_cmd(command, cls.shell_cls(kwargs), env=context.environ_full())
 
 

dekshell/core/markers/base/core.py

@@ -1,9 +1,9 @@
 import os
 import sys
-from types import NoneType
 from dektools.output import obj2str
 from dektools.str import hex_random
 from dektools.dict import MapChainContext
+from dektools.typing import NoneType
 from . import MarkerBase, TransformerMarker, ExitException, QuitContextException
 
 
@@ -350,6 +350,6 @@ class MarkerSet:
         try:
             root = self.generate_tree(commands, ln)
             return root.execute(
-                self.context_cls().update_variables((context or {}) | dict(__inner_marker_set__=self)), self)
+                self.context_cls().update_variables({**(context or {}), **dict(__inner_marker_set__=self)}), self)
         except ExitException:
             pass

dekshell/core/markers/base/shell.py

@@ -9,7 +9,7 @@ class ShellCommand:
         self.kwargs = kwargs
 
     def __call__(self, *args, **kwargs):
-        kwargs = kwargs | self.kwargs
+        kwargs = {**kwargs, **self.kwargs}
         return self.shell(*args, **kwargs)
 
     def shell(self, *args, **kwargs):

dekshell/utils/cmd.py

@@ -34,12 +34,13 @@ def ak2cmd(args=None, kwargs=None):
 
 
 def pack_context(args, kwargs):
-    return {f'{key_arg}{i}': arg for i, arg in enumerate(args)} | {key_args: tuple(args), key_kwargs: kwargs} | kwargs
+    return {
+        **{f'{key_arg}{i}': arg for i, arg in enumerate(args)}, **{key_args: tuple(args), key_kwargs: kwargs}, **kwargs}
 
 
 def pack_context_argv():
-    return {f"{key_argv}{i}": x for i, x in enumerate(sys.argv)} | {key_argv: sys.argv}
+    return {**{f"{key_argv}{i}": x for i, x in enumerate(sys.argv)}, **{key_argv: sys.argv}}
 
 
 def pack_context_full(args=None, kwargs=None):
-    return pack_context(args or [], kwargs or {}) | pack_context_argv()
+    return {**pack_context(args or [], kwargs or {}), **pack_context_argv()}

{dekshell-0.2.24.dist-info → dekshell-0.2.26.dist-info}/METADATA

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

{dekshell-0.2.24.dist-info → dekshell-0.2.26.dist-info}/RECORD

@@ -1,17 +1,17 @@
-dekshell-0.2.24.dist-info/METADATA,sha256=f-mIEj9boAs1HVZhe7DCujOQ6Kjst9S8Hz0pESrZR7Q,573
-dekshell-0.2.24.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
-dekshell-0.2.24.dist-info/entry_points.txt,sha256=d-kbfULiUTZWIBBsrQF3J_-wESncF-4K2rwHT08grlI,75
+dekshell-0.2.26.dist-info/METADATA,sha256=jKY1znFqUZbTul0uoKqPFnEz0J-3F3FgvypZomH-sQM,573
+dekshell-0.2.26.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
+dekshell-0.2.26.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/__entry__.py,sha256=fFvrYPXiTLxLS7XLPLPHy_DYTcNE7XL_LZUcVHfIrjA,82
 dekshell/click/__init__.py,sha256=rFzB_exzPQaIcbbms5PdHAU3NGdl2MBaYbq9v7g7BOI,1870
-dekshell/core/__init__.py,sha256=w-IeR-tO61Mv4ubZyw9LvyagudyD8SXH0YD3yKApNXk,5405
+dekshell/core/__init__.py,sha256=7d3AjVUGIjXIXRYYiJ03rz5ZONTTojmGfgwpjGmKqtU,5448
 dekshell/core/contexts/__init__.py,sha256=ynsfv37azOKfI2UKd0iPl2M6iBW-k5cb1BqSLOWuJpI,482
-dekshell/core/contexts/methods.py,sha256=-wyKam6IZIjk2269D8rXf85psOzFTMpCjfO_ZMd81yI,9630
+dekshell/core/contexts/methods.py,sha256=ksoOgBHDRM6uiGHw3ubCk4x7ExJKvJ6H3eGhaM-SNDE,9722
 dekshell/core/contexts/properties.py,sha256=esr51c6wDTDsuFXF2uj7WfyIGSq9H0dzqDqWzeMTNQE,2382
 dekshell/core/markers/__init__.py,sha256=_HJsxjjsyYbL7Pj6jhoeJ1WJI92qwCbdl-BKvQcGHlA,1949
-dekshell/core/markers/base/__init__.py,sha256=DDYlAIiVwmXCv4PiH042FRTwxn6Wxdnt0PsV_BSbYaY,13729
-dekshell/core/markers/base/core.py,sha256=ztB28fDPeqUkXCHchxjU2JO7R1klp_iUj2d6e8IlGCA,11567
-dekshell/core/markers/base/shell.py,sha256=DhaekMMTuABYP4GyZA05eejFfgxb1lQBwI88dlFv90E,479
+dekshell/core/markers/base/__init__.py,sha256=8WQ1b4J9JBjcPmgAPz5gmXbUf2WgGG41XrktRAvoW-A,13744
+dekshell/core/markers/base/core.py,sha256=LW1KiJBaRhXFOswpChRB9K7VvGQdY1H84wcr-8L9i-k,11582
+dekshell/core/markers/base/shell.py,sha256=fiFsTUDI8pSDDUCk834OI4ajri2qNWFJkLVhmUk2uAs,484
 dekshell/core/markers/commands.py,sha256=mDRj4dSfKbDaZ_ts4lPXd6wftvGFI4VKkRoIzxV7otA,1696
 dekshell/core/markers/comment.py,sha256=28iccgLs_0bRdXLhHyQR2I_kzlWdeMSqqNUFW-2vkes,818
 dekshell/core/markers/define.py,sha256=LpMSfz9ziXq2aFJ6oMpUFFo93TpBx7GxKYNzCeht4fQ,516
@@ -33,8 +33,8 @@ dekshell/core/plugin/__init__.py,sha256=jAB_KnnHJsyJR_zIfBU_HNLngyhcyyqVv05PdlNZ
 dekshell/core/redirect.py,sha256=6YCJpG0TkQ4WMt7LBtDD_W1T-C-QkLtGRQw0S60qe54,1058
 dekshell/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dekshell/utils/beep.py,sha256=teuQgHbWDr8BD1xCJ4Pt79X6N1-eq1tTlyGunK6wBIM,120
-dekshell/utils/cmd.py,sha256=FfWNRRRdiiTs3xoXvaAyZ-3OzsWFRnd3m5k6sIexrhc,1209
+dekshell/utils/cmd.py,sha256=A0lEixQ7Ui0UxmeuymniyqCZXss9qQdX1C0COM7EEkQ,1234
 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.24.dist-info/RECORD,,
+dekshell-0.2.26.dist-info/RECORD,,