fix: pypy3 support (webpy#731)

* fix: pypy3 support * refactor: only override builtin in pypy * chore: fix github actions for pypy * fix: invalid overridden in pypy Co-authored-by: Christian Clauss <cclauss@me.com>

Author: aisk

.github/workflows/lint_python.yml

@@ -31,8 +31,7 @@ jobs:
  strategy:
  fail-fast: false
  matrix:
- # TODO: (cclauss) add pypy3 https://github.com/webpy/webpy/issues/598
- python-version: ["3.6", "3.7", "3.8", "3.9", "3.10", "3.11-dev"] # , pypy3]
+ python-version: ["3.6", "3.7", "3.8", "3.9", "3.10", "3.11-dev", "pypy-3.9"]
 
  steps:
  - uses: actions/checkout@v3

tests/test_template.py

@@ -38,6 +38,11 @@ def testAttr(self):
  t("$code:\n foo = {'a': 1}.items()")()
  t("$code:\n bar = {k:0 for k in [1,2,3]}")()
 
+ def test_overridden(self):
+ tpl = "$print('blah')"
+ f = t(tpl, globals={"print": lambda x: x})
+ assert repr(f()) == "'blah\\n'"
+
 
 class TestRender:
  def test_template_without_ext(self, tmpdir):

web/template.py

@@ -29,12 +29,13 @@
 """
 
 import ast
+import builtins
 import glob
 import os
 import sys
 import tokenize
 from io import open
-import builtins
+from functools import partial
 
 from .net import websafe
 from .utils import re_compile, safestr, safeunicode, storage
@@ -878,10 +879,21 @@ def __call__(self, *a, **kw):
  __hidetraceback__ = True # noqa: F841
  return self.t(*a, **kw)
 
- def make_env(self, globals, builtins):
+ def make_env(self, globals, builtins_):
+ if sys.implementation.name == "pypy":
+ # Pypy's `__builtins__` can't be overridden in exec. More details see issue #598.
+ overridden_builtins = builtins.__dict__.keys() - builtins_.keys()
+
+ def f(name, *args, **kwargs):
+ raise NameError("name '%s' is not defined" % name)
+
+ for name in overridden_builtins:
+ if name not in globals:
+ globals[name] = partial(f, name)
+
  return dict(
  globals,
- __builtins__=builtins,
+ __builtins__=builtins_,
  ForLoop=ForLoop,
  TemplateResult=TemplateResult,
  escape_=self._escape,