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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: coconut-develop
-Version: 3.1.2.post0.dev5
+Version: 3.1.2.post0.dev6
 Summary: Simple, elegant, Pythonic functional programming.
 Home-page: http://coconut-lang.org
 Author: Evan Hubinger

{coconut_develop-3.1.2.post0.dev5 → coconut_develop-3.1.2.post0.dev6}/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.dev6}/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 = 6
 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.dev6}/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: