skip test on cpy < 3.10 and pypy < 3.8, fix pypy difference in logic …

…about builtins

src/exceptiongroup/_formatting.py

@@ -461,7 +461,15 @@ def _compute_suggestion_error(exc_value, tb):
         while tb.tb_next is not None:
             tb = tb.tb_next
         frame = tb.tb_frame
-        d = list(frame.f_locals) + list(frame.f_globals) + dir(__builtins__)
+
+        d = list(frame.f_locals) + list(frame.f_globals)
+        # NB: __builtins__ can be either a dict or a module here
+        builtins = frame.f_globals["__builtins__"]
+        if isinstance(builtins, dict):
+            d.extend(builtins)
+        else:
+            # module
+            d.extend(dir(builtins))
     if len(d) > _MAX_CANDIDATE_ITEMS:
         return None
     wrong_name_len = len(wrong_name)

tests/test_formatting.py

@@ -457,6 +457,10 @@ def test_print_exc(
         )
 
 
+@pytest.mark.skipif(
+    not hasattr(NameError, "name"),
+    reason="only works if NameError exposes the missing name",
+)
 def test_nameerror_suggestions(
     patched: bool, monkeypatch: MonkeyPatch, capsys: CaptureFixture
 ) -> None:
@@ -474,4 +478,4 @@ def test_nameerror_suggestions(
     except NameError:
         print_exc()
         output = capsys.readouterr().err
-        assert "Did you mean 'filter'?" in output
+        assert "Did you mean: 'filter'?" in output