coconut-develop 3.0.0a0.dev18__tar.gz → 3.0.0a0.dev19__tar.gz

{coconut-develop-3.0.0a0.dev18 → coconut-develop-3.0.0a0.dev19}/DOCS.md

@@ -450,7 +450,7 @@ user@computer ~ $ $(ls -la) |> .splitlines() |> len
 30
 ```
 
-Note that the way that Coconut integrates with `xonsh`, `@(<code>)` syntax will only work with Python code, not Coconut code.
+Note that the way that Coconut integrates with `xonsh`, `@(<code>)` syntax and the `execx` command will only work with Python code, not Coconut code.
 
 Additionally, Coconut will only compile individual commands—Coconut will not touch the `.xonshrc` or any other `.xsh` files.
 

{coconut-develop-3.0.0a0.dev18 → coconut-develop-3.0.0a0.dev19}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: coconut-develop
-Version: 3.0.0a0.dev18
+Version: 3.0.0a0.dev19
 Summary: Simple, elegant, Pythonic functional programming.
 Home-page: http://coconut-lang.org
 Author: Evan Hubinger
@@ -124,15 +124,15 @@ Classifier: Programming Language :: Python :: Implementation :: PyPy
 Classifier: Framework :: IPython
 Classifier: Framework :: Jupyter
 Classifier: Typing :: Typed
-Provides-Extra: kernel
+Provides-Extra: jupyter
 Provides-Extra: all
-Provides-Extra: mypy
+Provides-Extra: watch
+Provides-Extra: kernel
 Provides-Extra: jobs
+Provides-Extra: ipython
 Provides-Extra: docs
-Provides-Extra: xonsh
-Provides-Extra: watch
 Provides-Extra: tests
-Provides-Extra: backports
+Provides-Extra: mypy
 Provides-Extra: dev
-Provides-Extra: ipython
-Provides-Extra: jupyter
+Provides-Extra: backports
+Provides-Extra: xonsh

{coconut-develop-3.0.0a0.dev18 → coconut-develop-3.0.0a0.dev19}/coconut/constants.py

@@ -1112,6 +1112,8 @@ all_keywords = keyword_vars + const_vars + reserved_vars
 
 conda_build_env_var = "CONDA_BUILD"
 
+disabled_xonsh_modes = ("exec", "eval")
+
 # -----------------------------------------------------------------------------------------------------------------------
 # DOCUMENTATION CONSTANTS:
 # -----------------------------------------------------------------------------------------------------------------------

coconut-develop-3.0.0a0.dev19/coconut/icoconut/coconut/kernel.json

@@ -0,0 +1,11 @@
+{
+ "argv": [
+  "python",
+  "-m",
+  "coconut.icoconut",
+  "-f",
+  "{connection_file}"
+ ],
+ "language": "coconut",
+ "display_name": "Coconut"
+}

{coconut-develop-3.0.0a0.dev18 → coconut-develop-3.0.0a0.dev19}/coconut/integrations.py

@@ -21,7 +21,10 @@ from coconut.root import *  # NOQA
 
 from types import MethodType
 
-from coconut.constants import coconut_kernel_kwargs
+from coconut.constants import (
+    coconut_kernel_kwargs,
+    disabled_xonsh_modes,
+)
 
 # -----------------------------------------------------------------------------------------------------------------------
 # IPYTHON:
@@ -88,9 +91,7 @@ class CoconutXontribLoader(object):
     """Implements Coconut's _load_xontrib_."""
     compiler = None
     runner = None
-
-    def __init__(self):
-        self.timing_info = []
+    timing_info = []
 
     def __call__(self, xsh, **kwargs):
         # hide imports to avoid circular dependencies
@@ -111,16 +112,17 @@ class CoconutXontribLoader(object):
 
         self.runner.update_vars(xsh.ctx)
 
-        def new_parse(execer, s, *args, **kwargs):
+        def new_parse(execer, code, mode="exec", *args, **kwargs):
             """Coconut-aware version of xonsh's _parse."""
-            parse_start_time = get_clock_time()
-            try:
-                s = self.compiler.parse_xonsh(s, keep_state=True)
-            except CoconutException as err:
-                err_str = format_error(err).splitlines()[0]
-                s += "  #" + err_str
-            self.timing_info.append(("parse", get_clock_time() - parse_start_time))
-            return execer.__class__.parse(execer, s, *args, **kwargs)
+            if mode not in disabled_xonsh_modes:
+                parse_start_time = get_clock_time()
+                try:
+                    code = self.compiler.parse_xonsh(code, keep_state=True)
+                except CoconutException as err:
+                    err_str = format_error(err).splitlines()[0]
+                    code += "  #" + err_str
+                self.timing_info.append(("parse", get_clock_time() - parse_start_time))
+            return execer.__class__.parse(execer, code, mode=mode, *args, **kwargs)
 
         main_parser = xsh.execer.parser
         main_parser._coconut_old_parse = main_parser.parse
@@ -140,7 +142,7 @@ class CoconutXontribLoader(object):
 
         main_parser = xsh.execer.parser
         if not hasattr(main_parser, "_coconut_old_parse"):
-            raise CoconutException("attempting to unldoad Coconut xontrib but it was never loaded")
+            raise CoconutException("attempting to unload Coconut xontrib but it was never loaded")
         main_parser.parser = main_parser._coconut_old_parse
 
         ctx_parser = xsh.execer.ctxtransformer.parser

{coconut-develop-3.0.0a0.dev18 → coconut-develop-3.0.0a0.dev19}/coconut/root.py

@@ -26,7 +26,7 @@ import sys as _coconut_sys
 VERSION = "3.0.0"
 VERSION_NAME = None
 # False for release, int >= 1 for develop
-DEVELOP = 18
+DEVELOP = 19
 ALPHA = True  # for pre releases rather than post releases
 
 # -----------------------------------------------------------------------------------------------------------------------

coconut-develop-3.0.0a0.dev18/coconut/icoconut/coconut/kernel.json

@@ -1,11 +0,0 @@
-{
- "display_name": "Coconut", 
- "language": "coconut", 
- "argv": [
-  "python", 
-  "-m", 
-  "coconut.icoconut", 
-  "-f", 
-  "{connection_file}"
- ]
-}