dekshell 0.2.21__py3-none-any.whl → 0.2.22__py3-none-any.whl

dekshell/core/contexts/methods.py

@@ -175,6 +175,14 @@ def _pymd(name):
     return None
 
 
+def _pyms(path=None):
+    if not path:
+        path = _eval_mixin('fp', None)
+        if not path:
+            path = os.getcwd()
+    return seek_py_module_path(path)
+
+
 def _time_mark(begin=True, name=None):
     var_prefix = '__time_marker__'
     if name is None:
@@ -202,7 +210,7 @@ path_common_methods = {
     'pybin': lambda x, p=None: search_bin_by_path_tree(p or os.getcwd(), x, False),
     'pym': _pym,
     'pymd': _pymd,
-    'pyms': seek_py_module_path,
+    'pyms': _pyms,
 }
 
 default_methods = {

dekshell/core/markers/redirect.py

@@ -11,13 +11,19 @@ class MarkerRedirect(MarkerBase):
     def execute(self, context, command, marker_node, marker_set):
         filepath = self.split_raw(command, 1, self.tag_head)[1]
         if not filepath:
-            filepath = self.eval(context, 'fp')
+            filepath = self.get_filepath(context)
         path_shell = redirect_shell_by_path_tree(filepath)
         self.execute_core(context, marker_node, marker_set, path_shell)
 
     def execute_core(self, context, marker_node, marker_set, path_shell):
         raise NotImplementedError
 
+    def get_filepath(self, context):
+        try:
+            return self.eval(context, "fp")
+        except NameError:
+            return os.getcwd()
+
 
 class RedirectMarker(MarkerRedirect):
     tag_head = "redirect"
@@ -27,7 +33,7 @@ class RedirectMarker(MarkerRedirect):
         if path_shell:
             shell_properties = make_shell_properties(path_shell)
             if shell_properties['shell'] != current_shell:
-                fp = self.eval(context, "fp")
+                fp = self.get_filepath(context)
                 fpp = os.path.dirname(fp).replace('/', os.sep)
                 shell = shell_properties['sh']['rfc' if os.getcwd() == fpp else 'rf']
                 args, kwargs = self.eval(context, f'({key_args}, {key_kwargs})')

{dekshell-0.2.21.dist-info → dekshell-0.2.22.dist-info}/METADATA

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

{dekshell-0.2.21.dist-info → dekshell-0.2.22.dist-info}/RECORD

@@ -1,12 +1,12 @@
-dekshell-0.2.21.dist-info/METADATA,sha256=hMyPkDtXMgxohQMAE8K0woOezydn3-JXNBHnFD9kUdg,573
-dekshell-0.2.21.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
-dekshell-0.2.21.dist-info/entry_points.txt,sha256=d-kbfULiUTZWIBBsrQF3J_-wESncF-4K2rwHT08grlI,75
+dekshell-0.2.22.dist-info/METADATA,sha256=hcdopnmJAgC5TP6poIc9yTy4ETlQeFMJ-al3Z0kAD6g,573
+dekshell-0.2.22.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
+dekshell-0.2.22.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=rFzB_exzPQaIcbbms5PdHAU3NGdl2MBaYbq9v7g7BOI,1870
 dekshell/core/__init__.py,sha256=w-IeR-tO61Mv4ubZyw9LvyagudyD8SXH0YD3yKApNXk,5405
 dekshell/core/contexts/__init__.py,sha256=ynsfv37azOKfI2UKd0iPl2M6iBW-k5cb1BqSLOWuJpI,482
-dekshell/core/contexts/methods.py,sha256=6THhB6X6VqpHKLQIW3bOrd3J9yxHems2PRt8dR6xiT0,9344
+dekshell/core/contexts/methods.py,sha256=J1xYu469PCDiCHcktBzERn_ankONavPmJVYerFBVjzQ,9499
 dekshell/core/contexts/properties.py,sha256=esr51c6wDTDsuFXF2uj7WfyIGSq9H0dzqDqWzeMTNQE,2382
 dekshell/core/markers/__init__.py,sha256=yAZJEIK7eeaZvlIDwTFe2d3yKZiTUVGJQbHOnhNFOMQ,1891
 dekshell/core/markers/base/__init__.py,sha256=Rcc77ToE4cFlJvGwezRez4nAcfbdzgAhDRHaew5wvk0,13456
@@ -25,7 +25,7 @@ dekshell/core/markers/if_.py,sha256=bBG1fDCZd5alE5FSm0QhgHl6ZJn5awiqZAXnPnO-thc,
 dekshell/core/markers/input.py,sha256=O0yvGtt1uhbpE2gOReLseAmshVpZYMW3zV-OabZt0lw,1182
 dekshell/core/markers/invoke.py,sha256=To_U_FscoCbf7osvjC5MQTk2gjH5Mu_-06Kb22YQPTo,1441
 dekshell/core/markers/pip_.py,sha256=mxXa_oqcrk4Qz-HvhlkMoirsl-SbM9Fz610leNqP1o0,832
-dekshell/core/markers/redirect.py,sha256=WGaWW-7efaCIOYhs3gQgtKJC4lmFsBx2AQ4bs5Bu_UQ,1828
+dekshell/core/markers/redirect.py,sha256=3vfkRQ2tnQ6rSGGn7csgUlpDi0s2ep5X7JU7NVvo0eI,1984
 dekshell/core/markers/shell.py,sha256=43BDAAzMdmgZmemkW5buh_w4LL1GDGw-s9fNZo6vhag,1929
 dekshell/core/markers/var.py,sha256=O-lpWhnLOkKMwF1jR0rVwyHLa8YUWwacCs80wFzwfdQ,4838
 dekshell/core/markers/while_.py,sha256=e7lI5jsIM-qxNHMY_wUyCMvvesdXQibR5Ez2jNO9csc,1195
@@ -37,4 +37,4 @@ dekshell/utils/cmd.py,sha256=FfWNRRRdiiTs3xoXvaAyZ-3OzsWFRnd3m5k6sIexrhc,1209
 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.21.dist-info/RECORD,,
+dekshell-0.2.22.dist-info/RECORD,,