coconut-develop 3.1.2.post0.dev5__tar.gz → 3.1.2.post0.dev7__tar.gz

{coconut_develop-3.1.2.post0.dev5 → coconut_develop-3.1.2.post0.dev7}/DOCS.md

@@ -504,9 +504,9 @@ Coconut integrates with [`xonsh`](https://xon.sh/) to allow the use of Coconut c
 
 For an example of using Coconut from `xonsh`:
 ```
-user@computer ~ $ xontrib load coconut
-user@computer ~ $ cd ./files
-user@computer ~ $ $(ls -la) |> .splitlines() |> len
+user@computer ~ @ xontrib load coconut
+user@computer ~ @ cd ./files
+user@computer ~ @ $(ls -la) |> .splitlines() |> len
 30
 ```
 

{coconut_develop-3.1.2.post0.dev5 → coconut_develop-3.1.2.post0.dev7}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: coconut-develop
-Version: 3.1.2.post0.dev5
+Version: 3.1.2.post0.dev7
 Summary: Simple, elegant, Pythonic functional programming.
 Home-page: http://coconut-lang.org
 Author: Evan Hubinger
@@ -49,7 +49,7 @@ Requires-Dist: ipython<7.10,>=7.9; (python_version >= "3" and python_version < "
 Requires-Dist: ipython>=7.34; (python_version >= "3.7" and python_version < "3.8") and extra == "kernel"
 Requires-Dist: ipython>=8.12; (python_version >= "3.8" and python_version < "3.9") and extra == "kernel"
 Requires-Dist: ipython>=8.18; (python_version >= "3.9" and python_version < "3.10") and extra == "kernel"
-Requires-Dist: ipython>=8.27; python_version >= "3.10" and extra == "kernel"
+Requires-Dist: ipython>=9; python_version >= "3.10" and extra == "kernel"
 Requires-Dist: ipykernel>=4.10; python_version < "3" and extra == "kernel"
 Requires-Dist: ipykernel>=5.5; (python_version >= "3" and python_version < "3.8") and extra == "kernel"
 Requires-Dist: ipykernel>=6; python_version >= "3.8" and extra == "kernel"
@@ -62,7 +62,7 @@ Requires-Dist: pywinpty<0.6,>=0.5; (python_version < "3" and os_name == "nt") an
 Provides-Extra: watch
 Requires-Dist: watchdog>=0.10; extra == "watch"
 Provides-Extra: mypy
-Requires-Dist: mypy[python2]>=1.11; extra == "mypy"
+Requires-Dist: mypy[python2]>=1.15; extra == "mypy"
 Requires-Dist: types-backports>=0.1; extra == "mypy"
 Requires-Dist: typing>=3.10; python_version < "3.5" and extra == "mypy"
 Provides-Extra: pyright
@@ -72,20 +72,20 @@ Requires-Dist: typing>=3.10; python_version < "3.5" and extra == "pyright"
 Provides-Extra: xonsh
 Requires-Dist: xonsh>=0.9; python_version < "3.6" and extra == "xonsh"
 Requires-Dist: xonsh>=0.11; (python_version >= "3.6" and python_version < "3.9") and extra == "xonsh"
-Requires-Dist: xonsh>=0.18; python_version >= "3.9" and extra == "xonsh"
+Requires-Dist: xonsh>=0.19; python_version >= "3.9" and extra == "xonsh"
 Provides-Extra: numpy
 Requires-Dist: numpy>=1.16; (python_version < "3" and platform_python_implementation == "CPython") and extra == "numpy"
 Requires-Dist: numpy>=1.18; (python_version >= "3.4" and python_version < "3.9") and extra == "numpy"
 Requires-Dist: numpy>=1.26; python_version >= "3.9" and extra == "numpy"
 Requires-Dist: pandas>=1.1; python_version >= "3.6" and extra == "numpy"
-Requires-Dist: xarray>=2024; python_version >= "3.9" and extra == "numpy"
+Requires-Dist: xarray>=2025; python_version >= "3.9" and extra == "numpy"
 Provides-Extra: jupyter
 Requires-Dist: ipython>=5.4; python_version < "3" and extra == "jupyter"
 Requires-Dist: ipython<7.10,>=7.9; (python_version >= "3" and python_version < "3.7") and extra == "jupyter"
 Requires-Dist: ipython>=7.34; (python_version >= "3.7" and python_version < "3.8") and extra == "jupyter"
 Requires-Dist: ipython>=8.12; (python_version >= "3.8" and python_version < "3.9") and extra == "jupyter"
 Requires-Dist: ipython>=8.18; (python_version >= "3.9" and python_version < "3.10") and extra == "jupyter"
-Requires-Dist: ipython>=8.27; python_version >= "3.10" and extra == "jupyter"
+Requires-Dist: ipython>=9; python_version >= "3.10" and extra == "jupyter"
 Requires-Dist: ipykernel>=4.10; python_version < "3" and extra == "jupyter"
 Requires-Dist: ipykernel>=5.5; (python_version >= "3" and python_version < "3.8") and extra == "jupyter"
 Requires-Dist: ipykernel>=6; python_version >= "3.8" and extra == "jupyter"
@@ -106,7 +106,7 @@ Requires-Dist: ipython<7.10,>=7.9; (python_version >= "3" and python_version < "
 Requires-Dist: ipython>=7.34; (python_version >= "3.7" and python_version < "3.8") and extra == "jupyterlab"
 Requires-Dist: ipython>=8.12; (python_version >= "3.8" and python_version < "3.9") and extra == "jupyterlab"
 Requires-Dist: ipython>=8.18; (python_version >= "3.9" and python_version < "3.10") and extra == "jupyterlab"
-Requires-Dist: ipython>=8.27; python_version >= "3.10" and extra == "jupyterlab"
+Requires-Dist: ipython>=9; python_version >= "3.10" and extra == "jupyterlab"
 Requires-Dist: ipykernel>=4.10; python_version < "3" and extra == "jupyterlab"
 Requires-Dist: ipykernel>=5.5; (python_version >= "3" and python_version < "3.8") and extra == "jupyterlab"
 Requires-Dist: ipykernel>=6; python_version >= "3.8" and extra == "jupyterlab"
@@ -128,7 +128,7 @@ Requires-Dist: ipython<7.10,>=7.9; (python_version >= "3" and python_version < "
 Requires-Dist: ipython>=7.34; (python_version >= "3.7" and python_version < "3.8") and extra == "jupytext"
 Requires-Dist: ipython>=8.12; (python_version >= "3.8" and python_version < "3.9") and extra == "jupytext"
 Requires-Dist: ipython>=8.18; (python_version >= "3.9" and python_version < "3.10") and extra == "jupytext"
-Requires-Dist: ipython>=8.27; python_version >= "3.10" and extra == "jupytext"
+Requires-Dist: ipython>=9; python_version >= "3.10" and extra == "jupytext"
 Requires-Dist: ipykernel>=4.10; python_version < "3" and extra == "jupytext"
 Requires-Dist: ipykernel>=5.5; (python_version >= "3" and python_version < "3.8") and extra == "jupytext"
 Requires-Dist: ipykernel>=6; python_version >= "3.8" and extra == "jupytext"
@@ -150,7 +150,7 @@ Requires-Dist: ipython<7.10,>=7.9; (python_version >= "3" and python_version < "
 Requires-Dist: ipython>=7.34; (python_version >= "3.7" and python_version < "3.8") and extra == "all"
 Requires-Dist: ipython>=8.12; (python_version >= "3.8" and python_version < "3.9") and extra == "all"
 Requires-Dist: ipython>=8.18; (python_version >= "3.9" and python_version < "3.10") and extra == "all"
-Requires-Dist: ipython>=8.27; python_version >= "3.10" and extra == "all"
+Requires-Dist: ipython>=9; python_version >= "3.10" and extra == "all"
 Requires-Dist: ipykernel>=4.10; python_version < "3" and extra == "all"
 Requires-Dist: ipykernel>=5.5; (python_version >= "3" and python_version < "3.8") and extra == "all"
 Requires-Dist: ipykernel>=6; python_version >= "3.8" and extra == "all"
@@ -161,18 +161,18 @@ Requires-Dist: jedi<0.18,>=0.17; python_version < "3.9" and extra == "all"
 Requires-Dist: jedi>=0.19; python_version >= "3.9" and extra == "all"
 Requires-Dist: pywinpty<0.6,>=0.5; (python_version < "3" and os_name == "nt") and extra == "all"
 Requires-Dist: watchdog>=0.10; extra == "all"
-Requires-Dist: mypy[python2]>=1.11; extra == "all"
+Requires-Dist: mypy[python2]>=1.15; extra == "all"
 Requires-Dist: types-backports>=0.1; extra == "all"
 Requires-Dist: typing>=3.10; python_version < "3.5" and extra == "all"
 Requires-Dist: pyright>=1.1; extra == "all"
 Requires-Dist: xonsh>=0.9; python_version < "3.6" and extra == "all"
 Requires-Dist: xonsh>=0.11; (python_version >= "3.6" and python_version < "3.9") and extra == "all"
-Requires-Dist: xonsh>=0.18; python_version >= "3.9" and extra == "all"
+Requires-Dist: xonsh>=0.19; python_version >= "3.9" and extra == "all"
 Requires-Dist: numpy>=1.16; (python_version < "3" and platform_python_implementation == "CPython") and extra == "all"
 Requires-Dist: numpy>=1.18; (python_version >= "3.4" and python_version < "3.9") and extra == "all"
 Requires-Dist: numpy>=1.26; python_version >= "3.9" and extra == "all"
 Requires-Dist: pandas>=1.1; python_version >= "3.6" and extra == "all"
-Requires-Dist: xarray>=2024; python_version >= "3.9" and extra == "all"
+Requires-Dist: xarray>=2025; python_version >= "3.9" and extra == "all"
 Requires-Dist: jupyter>=1.1; extra == "all"
 Requires-Dist: jupyter-console>=5.2; python_version < "3.5" and extra == "all"
 Requires-Dist: jupyter-console>=6.1; (python_version >= "3.5" and python_version < "3.7") and extra == "all"
@@ -186,7 +186,7 @@ Requires-Dist: ipython<7.10,>=7.9; (python_version >= "3" and python_version < "
 Requires-Dist: ipython>=7.34; (python_version >= "3.7" and python_version < "3.8") and extra == "ipython"
 Requires-Dist: ipython>=8.12; (python_version >= "3.8" and python_version < "3.9") and extra == "ipython"
 Requires-Dist: ipython>=8.18; (python_version >= "3.9" and python_version < "3.10") and extra == "ipython"
-Requires-Dist: ipython>=8.27; python_version >= "3.10" and extra == "ipython"
+Requires-Dist: ipython>=9; python_version >= "3.10" and extra == "ipython"
 Requires-Dist: ipykernel>=4.10; python_version < "3" and extra == "ipython"
 Requires-Dist: ipykernel>=5.5; (python_version >= "3" and python_version < "3.8") and extra == "ipython"
 Requires-Dist: ipykernel>=6; python_version >= "3.8" and extra == "ipython"
@@ -204,9 +204,9 @@ Requires-Dist: papermill>=1.2; extra == "ipython"
 Provides-Extra: docs
 Requires-Dist: sphinx>=8; extra == "docs"
 Requires-Dist: pygments>=2.3; python_version < "3.9" and extra == "docs"
-Requires-Dist: pygments>=2.18; python_version >= "3.9" and extra == "docs"
+Requires-Dist: pygments>=2.19; python_version >= "3.9" and extra == "docs"
 Requires-Dist: myst-parser>=4; extra == "docs"
-Requires-Dist: pydata-sphinx-theme>=0.15; extra == "docs"
+Requires-Dist: pydata-sphinx-theme>=0.16; extra == "docs"
 Requires-Dist: sphinxcontrib_applehelp>=2; extra == "docs"
 Requires-Dist: sphinxcontrib_htmlhelp>=2; extra == "docs"
 Provides-Extra: tests
@@ -220,7 +220,7 @@ Requires-Dist: ipython<7.10,>=7.9; (python_version >= "3" and python_version < "
 Requires-Dist: ipython>=7.34; (python_version >= "3.7" and python_version < "3.8") and extra == "tests"
 Requires-Dist: ipython>=8.12; (python_version >= "3.8" and python_version < "3.9") and extra == "tests"
 Requires-Dist: ipython>=8.18; (python_version >= "3.9" and python_version < "3.10") and extra == "tests"
-Requires-Dist: ipython>=8.27; python_version >= "3.10" and extra == "tests"
+Requires-Dist: ipython>=9; python_version >= "3.10" and extra == "tests"
 Requires-Dist: ipykernel>=4.10; python_version < "3" and extra == "tests"
 Requires-Dist: ipykernel>=5.5; (python_version >= "3" and python_version < "3.8") and extra == "tests"
 Requires-Dist: ipykernel>=6; python_version >= "3.8" and extra == "tests"
@@ -241,7 +241,7 @@ Requires-Dist: ipython<7.10,>=7.9; (python_version >= "3" and python_version < "
 Requires-Dist: ipython>=7.34; (python_version >= "3.7" and python_version < "3.8") and extra == "dev"
 Requires-Dist: ipython>=8.12; (python_version >= "3.8" and python_version < "3.9") and extra == "dev"
 Requires-Dist: ipython>=8.18; (python_version >= "3.9" and python_version < "3.10") and extra == "dev"
-Requires-Dist: ipython>=8.27; python_version >= "3.10" and extra == "dev"
+Requires-Dist: ipython>=9; python_version >= "3.10" and extra == "dev"
 Requires-Dist: ipykernel>=4.10; python_version < "3" and extra == "dev"
 Requires-Dist: ipykernel>=5.5; (python_version >= "3" and python_version < "3.8") and extra == "dev"
 Requires-Dist: ipykernel>=6; python_version >= "3.8" and extra == "dev"
@@ -252,18 +252,18 @@ Requires-Dist: jedi<0.18,>=0.17; python_version < "3.9" and extra == "dev"
 Requires-Dist: jedi>=0.19; python_version >= "3.9" and extra == "dev"
 Requires-Dist: pywinpty<0.6,>=0.5; (python_version < "3" and os_name == "nt") and extra == "dev"
 Requires-Dist: watchdog>=0.10; extra == "dev"
-Requires-Dist: mypy[python2]>=1.11; extra == "dev"
+Requires-Dist: mypy[python2]>=1.15; extra == "dev"
 Requires-Dist: types-backports>=0.1; extra == "dev"
 Requires-Dist: typing>=3.10; python_version < "3.5" and extra == "dev"
 Requires-Dist: pyright>=1.1; extra == "dev"
 Requires-Dist: xonsh>=0.9; python_version < "3.6" and extra == "dev"
 Requires-Dist: xonsh>=0.11; (python_version >= "3.6" and python_version < "3.9") and extra == "dev"
-Requires-Dist: xonsh>=0.18; python_version >= "3.9" and extra == "dev"
+Requires-Dist: xonsh>=0.19; python_version >= "3.9" and extra == "dev"
 Requires-Dist: numpy>=1.16; (python_version < "3" and platform_python_implementation == "CPython") and extra == "dev"
 Requires-Dist: numpy>=1.18; (python_version >= "3.4" and python_version < "3.9") and extra == "dev"
 Requires-Dist: numpy>=1.26; python_version >= "3.9" and extra == "dev"
 Requires-Dist: pandas>=1.1; python_version >= "3.6" and extra == "dev"
-Requires-Dist: xarray>=2024; python_version >= "3.9" and extra == "dev"
+Requires-Dist: xarray>=2025; python_version >= "3.9" and extra == "dev"
 Requires-Dist: jupyter>=1.1; extra == "dev"
 Requires-Dist: jupyter-console>=5.2; python_version < "3.5" and extra == "dev"
 Requires-Dist: jupyter-console>=6.1; (python_version >= "3.5" and python_version < "3.7") and extra == "dev"
@@ -273,9 +273,9 @@ Requires-Dist: jupyterlab>=2.2; python_version >= "3.5" and extra == "dev"
 Requires-Dist: jupytext>=1.8; python_version >= "3" and extra == "dev"
 Requires-Dist: sphinx>=8; extra == "dev"
 Requires-Dist: pygments>=2.3; python_version < "3.9" and extra == "dev"
-Requires-Dist: pygments>=2.18; python_version >= "3.9" and extra == "dev"
+Requires-Dist: pygments>=2.19; python_version >= "3.9" and extra == "dev"
 Requires-Dist: myst-parser>=4; extra == "dev"
-Requires-Dist: pydata-sphinx-theme>=0.15; extra == "dev"
+Requires-Dist: pydata-sphinx-theme>=0.16; extra == "dev"
 Requires-Dist: sphinxcontrib_applehelp>=2; extra == "dev"
 Requires-Dist: sphinxcontrib_htmlhelp>=2; extra == "dev"
 Requires-Dist: pytest>=3; python_version < "3.6" and extra == "dev"
@@ -284,23 +284,23 @@ Requires-Dist: pytest<8.1,>=8.0; python_version >= "3.8" and extra == "dev"
 Requires-Dist: pexpect>=4; extra == "dev"
 Requires-Dist: pytest_remotedata>=0.3; extra == "dev"
 Requires-Dist: pyparsing<2.4.8,>=2.4.7; extra == "dev"
-Requires-Dist: pre-commit>=3; python_version >= "3" and extra == "dev"
+Requires-Dist: pre-commit>=4; python_version >= "3" and extra == "dev"
 Requires-Dist: requests>=2.32; extra == "dev"
 Requires-Dist: vprof>=0.36; extra == "dev"
-Requires-Dist: py-spy>=0.3; extra == "dev"
+Requires-Dist: py-spy>=0.4; extra == "dev"
 Requires-Dist: argparse>=1.4; python_version < "2.7"
-Requires-Dist: psutil>=6; python_version >= "2.7"
+Requires-Dist: psutil>=7; python_version >= "2.7"
 Requires-Dist: futures>=3.4; python_version < "3"
 Requires-Dist: backports.functools-lru-cache>=1.6; python_version < "3"
 Requires-Dist: prompt_toolkit<2,>=1; python_version < "3"
 Requires-Dist: prompt_toolkit>=1; python_version >= "3"
 Requires-Dist: pygments>=2.3; python_version < "3.9"
-Requires-Dist: pygments>=2.18; python_version >= "3.9"
+Requires-Dist: pygments>=2.19; python_version >= "3.9"
 Requires-Dist: typing_extensions>=3.10; python_version < "3.6"
 Requires-Dist: typing_extensions>=4.1; python_version >= "3.6" and python_version < "3.7"
 Requires-Dist: dataclasses>=0.8; python_version >= "3.6" and python_version < "3.7"
 Requires-Dist: typing_extensions>=4.7; python_version >= "3.7" and python_version < "3.8"
-Requires-Dist: typing_extensions>=4.12; python_version >= "3.8"
+Requires-Dist: typing_extensions>=4.13; python_version >= "3.8"
 Requires-Dist: trollius>=2.2; python_version < "3" and platform_python_implementation == "CPython"
 Requires-Dist: aenum>=3.1.15; python_version < "3.4"
 Requires-Dist: typing>=3.10; python_version < "3.5"
@@ -309,6 +309,17 @@ Requires-Dist: exceptiongroup>=1; python_version >= "3.7" and python_version < "
 Requires-Dist: anyio>=3; python_version >= "3.6"
 Requires-Dist: cPyparsing<2.4.7.2.5,>=2.4.7.2.4.1; platform_python_implementation == "CPython"
 Requires-Dist: pyparsing<2.4.8,>=2.4.7; platform_python_implementation != "CPython"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: license-file
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: summary
 
 |logo| Coconut
 ==============

{coconut_develop-3.1.2.post0.dev5 → coconut_develop-3.1.2.post0.dev7}/coconut/api.py

@@ -202,12 +202,12 @@ class CoconutImporter(object):
     command = None
 
     def __init__(self, *args):
-        self.use_cache_dir(default_use_cache_dir)
         self.set_args(args)
+        self.use_cache_dir(default_use_cache_dir)
 
     def use_cache_dir(self, use_cache_dir):
         """Set the cache directory if any to use for compiled Coconut files."""
-        if use_cache_dir:
+        if use_cache_dir and "--no-cache" not in self.args:
             if not PY34:
                 raise CoconutException("coconut.api.auto_compilation only supports the usage of a cache directory on Python 3.4+")
             self.cache_dir = coconut_cache_dir
@@ -238,7 +238,10 @@ class CoconutImporter(object):
 
         if package:
             self.cmd(path, *extra_args)
-            return cache_dir or path
+            if cache_dir:
+                return os.path.join(cache_dir, "__init__.py")
+            else:
+                return path
         else:
             destpath, = self.cmd(path, *extra_args)
             return destpath

{coconut_develop-3.1.2.post0.dev5 → coconut_develop-3.1.2.post0.dev7}/coconut/command/command.py

@@ -24,6 +24,7 @@ import os
 import time
 import shutil
 import random
+import sysconfig
 from contextlib import contextmanager
 from subprocess import CalledProcessError
 
@@ -1078,7 +1079,7 @@ class Command(object):
     def get_jupyter_command(self):
         """Get the correct jupyter command."""
         for jupyter in (
-            [sys.executable, "-m", "jupyter"],
+            [os.path.join(sysconfig.get_path("scripts"), "jupyter")],
             [sys.executable, "-m", "ipython"],
         ):
             if PY35:  # newer Python versions should only use "jupyter", not "ipython"

{coconut_develop-3.1.2.post0.dev5 → coconut_develop-3.1.2.post0.dev7}/coconut/constants.py

@@ -1052,8 +1052,8 @@ all_reqs = {
 # min versions are inclusive
 unpinned_min_versions = {
     "cPyparsing": (2, 4, 7, 2, 4, 1),
-    ("pre-commit", "py3"): (3,),
-    ("psutil", "py>=27"): (6,),
+    ("pre-commit", "py3"): (4,),
+    ("psutil", "py>=27"): (7,),
     "jupyter": (1, 1),
     "types-backports": (0, 1),
     ("futures", "py<3"): (3, 4),
@@ -1061,27 +1061,27 @@ unpinned_min_versions = {
     "pexpect": (4,),
     ("trollius", "py<3;cpy"): (2, 2),
     "requests": (2, 32),
-    ("xarray", "py39"): (2024,),
+    ("xarray", "py39"): (2025,),
     ("dataclasses", "py==36"): (0, 8),
     ("aenum", "py<34"): (3, 1, 15),
-    "pydata-sphinx-theme": (0, 15),
+    "pydata-sphinx-theme": (0, 16),
     "myst-parser": (4,),
     "sphinx": (8,),
     "sphinxcontrib_applehelp": (2,),
     "sphinxcontrib_htmlhelp": (2,),
-    "mypy[python2]": (1, 11),
+    "mypy[python2]": (1, 15),
     "pyright": (1, 1),
     ("jupyter-console", "py37"): (6, 6),
     ("typing", "py<35"): (3, 10),
-    ("typing_extensions", "py>=38"): (4, 12),
+    ("typing_extensions", "py>=38"): (4, 13),
     ("ipykernel", "py38"): (6,),
     ("jedi", "py39"): (0, 19),
-    ("pygments", "py>=39"): (2, 18),
-    ("xonsh", "py39"): (0, 18),
+    ("pygments", "py>=39"): (2, 19),
+    ("xonsh", "py39"): (0, 19),
     ("async_generator", "py35"): (1, 10),
     ("exceptiongroup", "py37;py<311"): (1,),
-    ("ipython", "py>=310"): (8, 27),
-    "py-spy": (0, 3),
+    ("ipython", "py>=310"): (9,),
+    "py-spy": (0, 4),
 }
 
 pinned_min_versions = {

{coconut_develop-3.1.2.post0.dev5 → coconut_develop-3.1.2.post0.dev7}/coconut/icoconut/root.py

@@ -52,8 +52,6 @@ from coconut.compiler.util import should_indent, paren_change, get_comment
 from coconut.command.util import Runner
 
 try:
-    from IPython.core.inputsplitter import IPythonInputSplitter
-    from IPython.core.inputtransformer import CoroutineInputTransformer
     from IPython.core.interactiveshell import InteractiveShellABC
     from IPython.core.compilerop import CachingCompiler
     from IPython.terminal.embed import InteractiveShellEmbed
@@ -73,6 +71,12 @@ except ImportError:
 else:
     LOAD_MODULE = True
 
+try:
+    from IPython.core.inputsplitter import IPythonInputSplitter
+    from IPython.core.inputtransformer import CoroutineInputTransformer
+except ImportError:
+    IPythonInputSplitter = None
+
 try:
     from papermill.translators import (
         papermill_translators,
@@ -154,89 +158,90 @@ if LOAD_MODULE:
                 compiled = source
             return super(CoconutCompiler, self).__call__(compiled, *args, **kwargs)
 
-    class CoconutSplitter(IPythonInputSplitter, object):
-        """IPython splitter for Coconut."""
-
-        def __init__(self, *args, **kwargs):
-            """Version of __init__ that sets up Coconut code compilation."""
-            super(CoconutSplitter, self).__init__(*args, **kwargs)
-            self._original_compile, self._compile = self._compile, self._coconut_compile
-            self.assemble_logical_lines = self._coconut_assemble_logical_lines()
-
-        def _coconut_compile(self, source, *args, **kwargs):
-            """Version of _compile that checks Coconut code.
-            None means that the code should not be run as is.
-            Any other value means that it can."""
-            if replace_all(source, default_whitespace_chars, "").endswith("\n\n"):
-                return True
-            elif should_indent(source):
-                return None
-            elif "\n" in source.rstrip():
-                return None
-            else:
-                return True
-
-        @staticmethod
-        @CoroutineInputTransformer.wrap
-        def _coconut_assemble_logical_lines():
-            """Version of assemble_logical_lines() that respects strings/parentheses/brackets/braces."""
-            line = ""
-            while True:
-                line = (yield line)
-                if not line or line.isspace():
-                    continue
-
-                parts = []
-                level = 0
-                while line is not None:
-
-                    # get no_strs_line
-                    no_strs_line = None
-                    while no_strs_line is None:
-                        no_strs_line = line.strip()
-                        if no_strs_line:
-                            no_strs_line = COMPILER.remove_strs(no_strs_line)
-                            if no_strs_line is None:
-                                # if we're in the middle of a string, fetch a new line
-                                for _ in range(num_assemble_logical_lines_tries):
-                                    new_line = (yield None)
-                                    if new_line is not None:
+    if IPythonInputSplitter is not None:
+        class CoconutSplitter(IPythonInputSplitter, object):
+            """IPython splitter for Coconut."""
+
+            def __init__(self, *args, **kwargs):
+                """Version of __init__ that sets up Coconut code compilation."""
+                super(CoconutSplitter, self).__init__(*args, **kwargs)
+                self._original_compile, self._compile = self._compile, self._coconut_compile
+                self.assemble_logical_lines = self._coconut_assemble_logical_lines()
+
+            def _coconut_compile(self, source, *args, **kwargs):
+                """Version of _compile that checks Coconut code.
+                None means that the code should not be run as is.
+                Any other value means that it can."""
+                if replace_all(source, default_whitespace_chars, "").endswith("\n\n"):
+                    return True
+                elif should_indent(source):
+                    return None
+                elif "\n" in source.rstrip():
+                    return None
+                else:
+                    return True
+
+            @staticmethod
+            @CoroutineInputTransformer.wrap
+            def _coconut_assemble_logical_lines():
+                """Version of assemble_logical_lines() that respects strings/parentheses/brackets/braces."""
+                line = ""
+                while True:
+                    line = (yield line)
+                    if not line or line.isspace():
+                        continue
+
+                    parts = []
+                    level = 0
+                    while line is not None:
+
+                        # get no_strs_line
+                        no_strs_line = None
+                        while no_strs_line is None:
+                            no_strs_line = line.strip()
+                            if no_strs_line:
+                                no_strs_line = COMPILER.remove_strs(no_strs_line)
+                                if no_strs_line is None:
+                                    # if we're in the middle of a string, fetch a new line
+                                    for _ in range(num_assemble_logical_lines_tries):
+                                        new_line = (yield None)
+                                        if new_line is not None:
+                                            break
+                                    if new_line is None:
+                                        # if we're not able to build a no_strs_line, we should stop doing line joining
+                                        level = 0
+                                        no_strs_line = ""
                                         break
-                                if new_line is None:
-                                    # if we're not able to build a no_strs_line, we should stop doing line joining
-                                    level = 0
-                                    no_strs_line = ""
-                                    break
-                                else:
-                                    line += new_line
-
-                    # update paren level
-                    level += paren_change(no_strs_line)
-
-                    # put line in parts and break if done
-                    if get_comment(line):
-                        parts.append(line)
-                        break
-                    elif level < 0:
-                        parts.append(line)
-                    elif no_strs_line.endswith("\\"):
-                        parts.append(line[:-1])
-                    else:
-                        parts.append(line)
-                        break
-
-                    # if we're not done, fetch a new line
-                    for _ in range(num_assemble_logical_lines_tries):
-                        line = (yield None)
-                        if line is not None:
+                                    else:
+                                        line += new_line
+
+                        # update paren level
+                        level += paren_change(no_strs_line)
+
+                        # put line in parts and break if done
+                        if get_comment(line):
+                            parts.append(line)
+                            break
+                        elif level < 0:
+                            parts.append(line)
+                        elif no_strs_line.endswith("\\"):
+                            parts.append(line[:-1])
+                        else:
+                            parts.append(line)
                             break
 
-                line = ''.join(parts)
+                        # if we're not done, fetch a new line
+                        for _ in range(num_assemble_logical_lines_tries):
+                            line = (yield None)
+                            if line is not None:
+                                break
 
-    INTERACTIVE_SHELL_CODE = '''
+                    line = ''.join(parts)
+
+    INTERACTIVE_SHELL_CODE = ('''
 input_splitter = CoconutSplitter(line_input_checker=True)
 input_transformer_manager = CoconutSplitter(line_input_checker=False)
-
+''' if IPythonInputSplitter is not None else "") + '''
 @override
 def init_instance_attrs(self):
     """Version of init_instance_attrs that uses CoconutCompiler."""

{coconut_develop-3.1.2.post0.dev5 → coconut_develop-3.1.2.post0.dev7}/coconut/root.py

@@ -26,7 +26,7 @@ import sys as _coconut_sys
 VERSION = "3.1.2"
 VERSION_NAME = None
 # False for release, int >= 1 for develop
-DEVELOP = 5
+DEVELOP = 7
 ALPHA = False  # for pre releases rather than post releases
 
 assert DEVELOP is False or DEVELOP >= 1, "DEVELOP must be False or an int >= 1"

{coconut_develop-3.1.2.post0.dev5 → coconut_develop-3.1.2.post0.dev7}/coconut/tests/main_test.py

@@ -136,11 +136,13 @@ pyston = os.path.join(os.curdir, "pyston")
 pyprover = os.path.join(os.curdir, "pyprover")
 prelude = os.path.join(os.curdir, "coconut-prelude")
 bbopt = os.path.join(os.curdir, "bbopt")
+imp_issue_dir = os.path.join(os.curdir, "coconut-issue")
 
 pyston_git = "https://github.com/evhub/pyston.git"
 pyprover_git = "https://github.com/evhub/pyprover.git"
 prelude_git = "https://github.com/evhub/coconut-prelude"
 bbopt_git = "https://github.com/evhub/bbopt.git"
+imp_issue_git = "https://github.com/evhub/coconut-issue.git"
 
 coconut_snip = "msg = '<success>'; pmsg = print$(msg); `pmsg`"
 target_3_snip = "assert super is py_super; print('<success>')"
@@ -1117,6 +1119,13 @@ if TEST_ALL:
                     if PYPY and PY2:
                         run_pyston()
 
+        def test_imp_issue(self):
+            with using_paths(imp_issue_dir):
+                if not os.path.exists(imp_issue_dir):
+                    call(["git", "clone", imp_issue_git])
+                with using_env_vars({"PYTHONPATH": os.pathsep.join([imp_issue_dir, os.environ.get("PYTHONPATH", "")])}):
+                    call_coconut(["-r", os.path.join(imp_issue_dir, "main.coco")])
+
 
 # -----------------------------------------------------------------------------------------------------------------------
 # MAIN: