Revert "pythonGH-141686: Break cycles created by JSONEncoder.iterencode (pythonGH-141687)"

This reverts commit 4cfa695.

Author: makiper

Lib/json/encoder.py

@@ -264,6 +264,17 @@ def floatstr(o, allow_nan=self.allow_nan,
 
 def _make_iterencode(markers, _default, _encoder, _indent, _floatstr,
         _key_separator, _item_separator, _sort_keys, _skipkeys, _one_shot,
+        ## HACK: hand-optimized bytecode; turn globals into locals
+        ValueError=ValueError,
+        dict=dict,
+        float=float,
+        id=id,
+        int=int,
+        isinstance=isinstance,
+        list=list,
+        str=str,
+        tuple=tuple,
+        _intstr=int.__repr__,
     ):
 
     def _iterencode_list(lst, _current_indent_level):
@@ -300,7 +311,7 @@ def _iterencode_list(lst, _current_indent_level):
                     # Subclasses of int/float may override __repr__, but we still
                     # want to encode them as integers/floats in JSON. One example
                     # within the standard library is IntEnum.
-                    yield buf + int.__repr__(value)
+                    yield buf + _intstr(value)
                 elif isinstance(value, float):
                     # see comment above for int
                     yield buf + _floatstr(value)
@@ -363,7 +374,7 @@ def _iterencode_dict(dct, _current_indent_level):
                 key = 'null'
             elif isinstance(key, int):
                 # see comment for int/float in _make_iterencode
-                key = int.__repr__(key)
+                key = _intstr(key)
             elif _skipkeys:
                 continue
             else:
@@ -388,7 +399,7 @@ def _iterencode_dict(dct, _current_indent_level):
                     yield 'false'
                 elif isinstance(value, int):
                     # see comment for int/float in _make_iterencode
-                    yield int.__repr__(value)
+                    yield _intstr(value)
                 elif isinstance(value, float):
                     # see comment for int/float in _make_iterencode
                     yield _floatstr(value)
@@ -423,7 +434,7 @@ def _iterencode(o, _current_indent_level):
             yield 'false'
         elif isinstance(o, int):
             # see comment for int/float in _make_iterencode
-            yield int.__repr__(o)
+            yield _intstr(o)
         elif isinstance(o, float):
             # see comment for int/float in _make_iterencode
             yield _floatstr(o)
@@ -447,13 +458,4 @@ def _iterencode(o, _current_indent_level):
                 raise
             if markers is not None:
                 del markers[markerid]
-
-    def _iterencode_once(o, _current_indent_level):
-        nonlocal _iterencode, _iterencode_dict, _iterencode_list
-        try:
-            yield from _iterencode(o, _current_indent_level)
-        finally:
-            # Break reference cycles due to mutually recursive closures:
-            del _iterencode, _iterencode_dict, _iterencode_list
-
-    return _iterencode_once
+    return _iterencode