Merge branch 'master' into y/bstr+x/gpystr

* master:
  golang: Fix `@func(cls) def name` not to set `name` in calling context
  gpython: tests: Remove grepv utility
  gpython: tests: Fix test of warning filters.

golang/__init__.py

@@ -86,11 +86,29 @@ def _meth(cls, fcall):
         if already is not missing:
             return already
 
-        # FIXME try to arrange so that python does not set anything on caller's
-        # namespace[func_name]  (currently it sets that to implicitly returned None)
+        # arrange so that python eventually does not set anything on caller's
+        # namespace[func_name]  (it unconditionally sets what decorator returns, even implicit None)
+        #
+        # _DelAttrAfterMeth.__del__ is invoked:
+        # * on cpython: right after  namespace[func_name] = returned _meth_leftover
+        # * on pypy:    eventually on next GC
+        fcall.f_locals[func_name] = _DelAttrAfterMeth(fcall.f_locals, func_name)
+        return _meth_leftover
 
     return deco
 
+# _DelAttrAfterMeth serves _meth by unsetting f_locals[meth] that python
+# unconditionally sets after `@func(cls) def meth()`.
+_meth_leftover = object()
+class _DelAttrAfterMeth(object):
+    def __init__(self, f_locals, name):
+        self.f_locals = f_locals
+        self.name     = name
+    def __del__(self):
+        obj = self.f_locals.get(self.name)
+        if obj is _meth_leftover:
+            del self.f_locals[self.name]
+
 # _func serves @func.
 def _func(f):
     # @staticmethod & friends require special care:

golang/golang_test.py

@@ -1004,12 +1004,20 @@ def test_func():
     assert mcls is mcls_orig
     assert mcls == 'mcls'
 
-    # FIXME undefined var after `@func(cls) def var` should be not set
+    # undefined var after `@func(cls) def var` should be not set
+    assert 'var' not in locals()
+    @func(MyClass)
+    def var(self, v):
+        assert v == 8
+        return v + 1
+    gc.collect()    # pypy needs this to trigger _DelAttrAfterMeth GC
+    assert 'var' not in locals()
 
     obj = MyClass(4)
     assert obj.zzz(4)       == 4 + 1
     assert obj.mstatic(5)   == 5 + 1
     assert obj.mcls(7)      == 7 + 1
+    assert obj.var(8)       == 8 + 1
 
     # this tests that @func (used by @func(cls)) preserves decorated function signature
     assert fmtargspec(MyClass.zzz) == '(self, v, x=2, **kkkkwww)'
@@ -1023,6 +1031,8 @@ def test_func():
     assert MyClass.mcls.__module__      == __name__
     assert MyClass.mcls.__name__        == 'mcls'
 
+    assert MyClass.var.__module__       == __name__
+    assert MyClass.var.__name__         == 'var'
 
 # @func overhead at def time.
 def bench_def(b):

gpython/gpython_test.py

@@ -260,26 +260,27 @@ def test_pymain():
     # -W <opt>
     _ = pyout(['-Werror', '-Whello', '-W', 'ignore::DeprecationWarning',
                'testprog/print_warnings_setup.py'], cwd=here)
-    if PY2:
-        # py2 threading, which is imported after gpython startup, adds ignore
-        # for sys.exc_clear
-        _ = grepv(r'ignore:sys.exc_clear:DeprecationWarning:threading:*', _)
-    assert _.startswith(
-        b"sys.warnoptions: ['error', 'hello', 'ignore::DeprecationWarning']\n\n" + \
-        b"warnings.filters:\n" + \
-        b"- ignore::DeprecationWarning::*\n" + \
-        b"- error::Warning::*\n"), _
+    assert re.match(
+        br"sys\.warnoptions: \['error', 'hello', 'ignore::DeprecationWarning'\]\n\n"
+        br"warnings\.filters:\n"
+        br"(- [^\n]+\n)*" # Additional filters added by automatically imported modules
+        br"- ignore::DeprecationWarning::\*\n"
+        br"- error::Warning::\*\n"
+        br"(- [^\n]+\n)*", # Remaining filters
+        _,
+    )
     # $PYTHONWARNINGS
     _ = pyout(['testprog/print_warnings_setup.py'], cwd=here,
               envadj={'PYTHONWARNINGS': 'ignore,world,error::SyntaxWarning'})
-    if PY2:
-        # see ^^^
-        _ = grepv(r'ignore:sys.exc_clear:DeprecationWarning:threading:*', _)
-    assert _.startswith(
-        b"sys.warnoptions: ['ignore', 'world', 'error::SyntaxWarning']\n\n" + \
-        b"warnings.filters:\n" + \
-        b"- error::SyntaxWarning::*\n" + \
-        b"- ignore::Warning::*\n"), _
+    assert re.match(
+        br"sys\.warnoptions: \['ignore', 'world', 'error::SyntaxWarning'\]\n\n"
+        br"warnings\.filters:\n"
+        br"(- [^\n]+\n)*" # Additional filters added by automatically imported modules
+        br"- error::SyntaxWarning::\*\n"
+        br"- ignore::Warning::\*\n"
+        br"(- [^\n]+\n)*", # Remaining filters
+        _,
+    )
 
 
 def test_pymain_print_function_future():
@@ -439,20 +440,6 @@ def _xopt_assert_in_subprocess(xopt, xval, tfunc):
 
 # ---- misc ----
 
-# grepv filters out lines matching pattern from text.
-def grepv(pattern, text): # -> text
-    if isinstance(text, bytes):
-        t = b''
-    else:
-        t = ''
-    p = re.compile(pattern)
-    v = []
-    for l in text.splitlines(True):
-        m = p.search(l)
-        if not m:
-            v.append(l)
-    return t.join(v)
-
 # check_gpy_vs_py verifies that gpython output matches underlying python output.
 def check_gpy_vs_py(argv, postprocessf=None, **kw):
         gpyout   = u(pyout(argv, **kw))