Merge pull request #1300 from kmod/func_globals

Have function.func_globals always be dict-like

src/runtime/types.cpp

@@ -305,6 +305,9 @@ extern "C" BoxedFunctionBase::BoxedFunctionBase(FunctionMetadata* md, llvm::Arra
       doc(NULL) {
     assert((!globals) == (!md->source || md->source->scoping->areGlobalsFromModule()));
 
+    if (globals)
+        ASSERT(globals->cls == dict_cls || globals->cls == module_cls, "%s", globals->cls->tp_name);
+
     Py_XINCREF(closure);
     Py_XINCREF(globals);
 
@@ -1699,6 +1702,8 @@ static Box* function_globals(Box* self, void*) noexcept {
     BoxedFunction* func = static_cast<BoxedFunction*>(self);
     if (func->globals) {
         assert(!func->md->source || !func->md->source->scoping->areGlobalsFromModule());
+        if (func->globals->cls == module_cls)
+            return incref(func->globals->getAttrWrapper());
         return incref(func->globals);
     }
     assert(func->md->source);

test/extra/cffi_test.py

@@ -25,9 +25,9 @@ def install_and_test_cffi():
 
     # looks like clang 3.5 causes more errors like: 214 != -42 doing casts
     if os.environ.has_key("CC") and "clang" in os.environ["CC"]:
-        expected = [{ "failed": 20, "passed": 1657, "skipped": 70, "xfailed": 4, "error": 5 }]
+        expected = [{ "failed": 20, "passed": 1659, "skipped": 73, "xfailed": 4}]
     else:
-        expected = [{ "failed": 11, "passed": 1666, "skipped": 70, "xfailed": 4, "error": 5 }]
+        expected = [{ "failed": 11, "passed": 1668, "skipped": 73, "xfailed": 4}]
     run_test([PYTEST_EXE], cwd=CFFI_DIR, expected=expected)
    
 create_virtenv(ENV_NAME, ["pytest==2.8.7", "py==1.4.31", "pycparser==2.14"], force_create = True)

test/integration/pytest_test.py

+import os, sys, subprocess, shutil
+sys.path.append(os.path.dirname(__file__) + "/../lib")
+
+from test_helper import create_virtenv, run_test
+
+ENV_NAME = "pytest_test_env_" + os.path.basename(sys.executable)
+ENV_DIR = os.path.abspath(ENV_NAME)
+SRC_DIR = os.path.abspath(os.path.join(ENV_NAME, "src"))
+PYTHON_EXE = os.path.abspath(os.path.join(ENV_NAME, "bin", "python"))
+
+pkg = ["pytest==2.8.2"]
+create_virtenv(ENV_NAME, pkg)
+PYTEST_DIR = os.path.abspath(os.path.join(SRC_DIR, "pytest"))
+
+test_dir = os.path.join(ENV_DIR, "tests")
+if not os.path.exists(test_dir):
+    os.mkdir(test_dir)
+
+with open(os.path.join(test_dir, "test_foo.py"), 'w') as f:
+    f.write("""
+import pytest
+@pytest.mark.skipif(True, reason="for fun")
+def test_skipif_true():
+    1/0
+""")
+
+subprocess.check_call([os.path.join(ENV_DIR, "bin", "py.test"), test_dir])
+# subprocess.check_call(["gdb", "--args", PYTHON_EXE, "-m", "pytest", test_dir])
+
+

test/tests/functions.py

@@ -97,3 +97,19 @@ g2 = copyfunc(g)
 assert g.func_defaults == g2.func_defaults, (g.func_defaults, g2.func_defaults)
 g(1)
 g2(2)
+
+
+# Regression test: make sure that __globals__/func_globals gets set
+# properly in exec cases
+d = {}
+exec """
+def f():
+    pass
+""" in d
+assert type(d['f'].__globals__) == dict
+
+exec """
+def f():
+    pass
+""" in globals()
+assert type(globals()['f'].__globals__) == type(globals())