rename

Author: JelleZijlstra

Grammar/python.gram

@@ -284,11 +284,11 @@ class_def_raw[stmt_ty]:
                      (b) ? ((expr_ty) b)->v.Call.args : NULL,
                      (b) ? ((expr_ty) b)->v.Call.keywords : NULL,
                      c, NULL, t, NULL, EXTRA) }
-    | builder=NAME a=NAME t=[type_params] b=['(' z=[arguments] ')' { z }] ':' c=block {
+    | "make" maker=NAME a=NAME t=[type_params] b=['(' z=[arguments] ')' { z }] ':' c=block {
         _PyAST_ClassDef(a->v.Name.id,
                      (b) ? ((expr_ty) b)->v.Call.args : NULL,
                      (b) ? ((expr_ty) b)->v.Call.keywords : NULL,
-                     c, NULL, t, builder, EXTRA) }
+                     c, NULL, t, maker, EXTRA) }
 
 # Function definitions
 # --------------------

Include/internal/pycore_ast.h

@@ -179,6 +179,7 @@ struct _Py_global_strings {
         STRUCT_FOR_ID(__lshift__)
         STRUCT_FOR_ID(__lt__)
         STRUCT_FOR_ID(__main__)
+        STRUCT_FOR_ID(__make__)
         STRUCT_FOR_ID(__match_args__)
         STRUCT_FOR_ID(__matmul__)
         STRUCT_FOR_ID(__missing__)

Include/internal/pycore_ast_state.h

@@ -206,8 +206,8 @@ def __repr__(self):
 # @dataclass.
 _PARAMS = '__dataclass_params__'
 
-# The name of a temporary attribute on builder-created slotted classes.
-_BUILDER_DEFAULTS = '__dataclass_builder_defaults__'
+# The name of a temporary attribute on maker-created slotted classes.
+_MAKER_DEFAULTS = '__dataclass_maker_defaults__'
 
 # The name of the function, that if it exists, is called at the end of
 # __init__.
@@ -824,9 +824,9 @@ def _get_field(cls, a_name, a_type, default_kw_only):
 
     # If the default value isn't derived from Field, then it's only a
     # normal default value.  Convert it to a Field().
-    builder_defaults = getattr(cls, _BUILDER_DEFAULTS, None)
-    if builder_defaults is not None and a_name in builder_defaults:
-        default = builder_defaults[a_name]
+    maker_defaults = getattr(cls, _MAKER_DEFAULTS, None)
+    if maker_defaults is not None and a_name in maker_defaults:
+        default = maker_defaults[a_name]
     else:
         default = getattr(cls, a_name, MISSING)
     if isinstance(default, Field):
@@ -1257,7 +1257,7 @@ def _process_class(cls, init, repr, eq, order, unsafe_hash, frozen,
 
     if slots_already_added:
         try:
-            delattr(cls, _BUILDER_DEFAULTS)
+            delattr(cls, _MAKER_DEFAULTS)
         except AttributeError:
             pass
 
@@ -1502,7 +1502,7 @@ def _split_dataclass_build_class_kwargs(kwds):
     return dataclass_kwds, class_kwds
 
 
-def _get_dataclass_builder_annotations(ns):
+def _get_dataclass_maker_annotations(ns):
     annotate = ns.get('__annotate_func__')
     if annotate is None:
         return ns.get('__annotations__', {})
@@ -1514,12 +1514,12 @@ class _DataclassBuilderNamespace:
     pass
 
 
-def _get_dataclass_builder_slots(ns, bases, weakref_slot):
+def _get_dataclass_maker_slots(ns, bases, weakref_slot):
     if '__slots__' in ns:
         name = ns.get('__qualname__', ns.get('__name__'))
         raise TypeError(f'{name} already specifies __slots__')
 
-    annotations = _get_dataclass_builder_annotations(ns)
+    annotations = _get_dataclass_maker_annotations(ns)
     proxy = _DataclassBuilderNamespace()
     proxy.__module__ = ns.get('__module__')
     for name, value in ns.items():
@@ -1559,15 +1559,15 @@ def _get_dataclass_builder_slots(ns, bases, weakref_slot):
                          weakref_slot)
 
 
-def _add_dataclass_builder_slots(ns, bases, dataclass_kwds):
+def _add_dataclass_maker_slots(ns, bases, dataclass_kwds):
     defaults = {}
     weakref_slot = dataclass_kwds.get('weakref_slot', False)
-    ns['__slots__'] = _get_dataclass_builder_slots(ns, bases, weakref_slot)
+    ns['__slots__'] = _get_dataclass_maker_slots(ns, bases, weakref_slot)
     for slot in ns['__slots__']:
         if slot in ns:
             defaults[slot] = ns.pop(slot)
     if defaults:
-        ns[_BUILDER_DEFAULTS] = defaults
+        ns[_MAKER_DEFAULTS] = defaults
 
 
 def _dataclass_build_class(func, name, *bases, **kwds):
@@ -1578,7 +1578,7 @@ def _dataclass_build_class(func, name, *bases, **kwds):
     def exec_body(ns):
         types.exec_class_body(func, ns)
         if slots:
-            _add_dataclass_builder_slots(ns, resolved_bases, dataclass_kwds)
+            _add_dataclass_maker_slots(ns, resolved_bases, dataclass_kwds)
         if resolved_bases is not bases:
             ns['__orig_bases__'] = bases
 
@@ -1601,7 +1601,7 @@ def exec_body(ns):
     return dataclass(cls, **dataclass_kwds)
 
 
-dataclass.__build_class__ = _dataclass_build_class
+dataclass.__make__ = _dataclass_build_class
 
 
 def fields(class_or_instance):

Include/internal/pycore_global_objects_fini_generated.h

@@ -1355,14 +1355,14 @@ def value(self):
         return self._value_
 
 
-class _EnumClassBuilder:
-    def __build_class__(self, func, name, *bases, **kwds):
+class _EnumClassMaker:
+    def __make__(self, func, name, *bases, **kwds):
         if any(isinstance(base, EnumType) for base in bases):
             return bltns.__build_class__(func, name, *bases, **kwds)
         return bltns.__build_class__(func, name, *bases, Enum, **kwds)
 
 
-enum = _EnumClassBuilder()
+enum = _EnumClassMaker()
 
 
 class ReprEnum(Enum):

Include/internal/pycore_global_strings.h

@@ -12,10 +12,10 @@ Module(body=[FunctionDef(name='f', args=arguments(posonlyargs=[], args=[arg(...)
 Module(body=[FunctionDef(name='f', args=arguments(posonlyargs=[], args=[], vararg=None, kwonlyargs=[], kw_defaults=[], kwarg=None, defaults=[]), body=[Pass()], decorator_list=[], returns=Subscript(value=Name(...), slice=Tuple(...), ctx=Load(...)), type_comment=None, type_params=[])], type_ignores=[])
 Module(body=[FunctionDef(name='f', args=arguments(posonlyargs=[], args=[], vararg=None, kwonlyargs=[], kw_defaults=[], kwarg=None, defaults=[]), body=[Pass()], decorator_list=[], returns=Subscript(value=Name(...), slice=Tuple(...), ctx=Load(...)), type_comment=None, type_params=[])], type_ignores=[])
 Module(body=[FunctionDef(name='f', args=arguments(posonlyargs=[], args=[], vararg=None, kwonlyargs=[], kw_defaults=[], kwarg=None, defaults=[]), body=[Pass()], decorator_list=[], returns=Subscript(value=Name(...), slice=Tuple(...), ctx=Load(...)), type_comment=None, type_params=[])], type_ignores=[])
-Module(body=[ClassDef(name='C', bases=[], keywords=[], body=[Pass()], decorator_list=[], type_params=[], builder=None)], type_ignores=[])
-Module(body=[ClassDef(name='C', bases=[], keywords=[], body=[Expr(value=Constant(...))], decorator_list=[], type_params=[], builder=None)], type_ignores=[])
-Module(body=[ClassDef(name='C', bases=[Name(id='object', ctx=Load(...))], keywords=[], body=[Pass()], decorator_list=[], type_params=[], builder=None)], type_ignores=[])
-Module(body=[ClassDef(name='C', bases=[Name(id='A', ctx=Load(...)), Name(id='B', ctx=Load(...))], keywords=[], body=[Pass()], decorator_list=[], type_params=[], builder=None)], type_ignores=[])
+Module(body=[ClassDef(name='C', bases=[], keywords=[], body=[Pass()], decorator_list=[], type_params=[], maker=None)], type_ignores=[])
+Module(body=[ClassDef(name='C', bases=[], keywords=[], body=[Expr(value=Constant(...))], decorator_list=[], type_params=[], maker=None)], type_ignores=[])
+Module(body=[ClassDef(name='C', bases=[Name(id='object', ctx=Load(...))], keywords=[], body=[Pass()], decorator_list=[], type_params=[], maker=None)], type_ignores=[])
+Module(body=[ClassDef(name='C', bases=[Name(id='A', ctx=Load(...)), Name(id='B', ctx=Load(...))], keywords=[], body=[Pass()], decorator_list=[], type_params=[], maker=None)], type_ignores=[])
 Module(body=[FunctionDef(name='f', args=arguments(posonlyargs=[], args=[], vararg=None, kwonlyargs=[], kw_defaults=[], kwarg=None, defaults=[]), body=[Return(value=Constant(...))], decorator_list=[], returns=None, type_comment=None, type_params=[])], type_ignores=[])
 Module(body=[FunctionDef(name='f', args=arguments(posonlyargs=[], args=[], vararg=None, kwonlyargs=[], kw_defaults=[], kwarg=None, defaults=[]), body=[Return(value=None)], decorator_list=[], returns=None, type_comment=None, type_params=[])], type_ignores=[])
 Module(body=[Delete(targets=[Name(id='v', ctx=Del(...))])], type_ignores=[])
@@ -100,7 +100,7 @@ Module(body=[FunctionDef(name='f', args=arguments(posonlyargs=[], args=[], varar
 Module(body=[AsyncFunctionDef(name='f', args=arguments(posonlyargs=[], args=[], vararg=None, kwonlyargs=[], kw_defaults=[], kwarg=None, defaults=[]), body=[Expr(value=ListComp(...))], decorator_list=[], returns=None, type_comment=None, type_params=[])], type_ignores=[])
 Module(body=[FunctionDef(name='f', args=arguments(posonlyargs=[], args=[], vararg=None, kwonlyargs=[], kw_defaults=[], kwarg=None, defaults=[]), body=[Pass()], decorator_list=[Name(id='deco1', ctx=Load(...)), ..., Call(func=Name(...), args=[Constant(...)], keywords=[])], returns=None, type_comment=None, type_params=[])], type_ignores=[])
 Module(body=[AsyncFunctionDef(name='f', args=arguments(posonlyargs=[], args=[], vararg=None, kwonlyargs=[], kw_defaults=[], kwarg=None, defaults=[]), body=[Pass()], decorator_list=[Name(id='deco1', ctx=Load(...)), ..., Call(func=Name(...), args=[Constant(...)], keywords=[])], returns=None, type_comment=None, type_params=[])], type_ignores=[])
-Module(body=[ClassDef(name='C', bases=[], keywords=[], body=[Pass()], decorator_list=[Name(id='deco1', ctx=Load(...)), ..., Call(func=Name(...), args=[Constant(...)], keywords=[])], type_params=[], builder=None)], type_ignores=[])
+Module(body=[ClassDef(name='C', bases=[], keywords=[], body=[Pass()], decorator_list=[Name(id='deco1', ctx=Load(...)), ..., Call(func=Name(...), args=[Constant(...)], keywords=[])], type_params=[], maker=None)], type_ignores=[])
 Module(body=[FunctionDef(name='f', args=arguments(posonlyargs=[], args=[], vararg=None, kwonlyargs=[], kw_defaults=[], kwarg=None, defaults=[]), body=[Pass()], decorator_list=[Call(func=Name(...), args=[GeneratorExp(...)], keywords=[])], returns=None, type_comment=None, type_params=[])], type_ignores=[])
 Module(body=[FunctionDef(name='f', args=arguments(posonlyargs=[], args=[], vararg=None, kwonlyargs=[], kw_defaults=[], kwarg=None, defaults=[]), body=[Pass()], decorator_list=[Attribute(value=Attribute(...), attr='c', ctx=Load(...))], returns=None, type_comment=None, type_params=[])], type_ignores=[])
 Module(body=[Expr(value=NamedExpr(target=Name(...), value=Constant(...)))], type_ignores=[])
@@ -122,11 +122,11 @@ Module(body=[TypeAlias(name=Name(id='X', ctx=Store(...)), type_params=[TypeVar(n
 Module(body=[TypeAlias(name=Name(id='X', ctx=Store(...)), type_params=[TypeVar(name='T', bound=Name(...), default_value=None), ..., ParamSpec(name='P', default_value=None)], value=Tuple(elts=[Name(...), ..., Name(...)], ctx=Load(...)))], type_ignores=[])
 Module(body=[TypeAlias(name=Name(id='X', ctx=Store(...)), type_params=[TypeVar(name='T', bound=Tuple(...), default_value=None), ..., ParamSpec(name='P', default_value=None)], value=Tuple(elts=[Name(...), ..., Name(...)], ctx=Load(...)))], type_ignores=[])
 Module(body=[TypeAlias(name=Name(id='X', ctx=Store(...)), type_params=[TypeVar(name='T', bound=Name(...), default_value=Constant(...)), ..., ParamSpec(name='P', default_value=Constant(...))], value=Tuple(elts=[Name(...), ..., Name(...)], ctx=Load(...)))], type_ignores=[])
-Module(body=[ClassDef(name='X', bases=[], keywords=[], body=[Pass()], decorator_list=[], type_params=[TypeVar(name='T', bound=None, default_value=None)], builder=None)], type_ignores=[])
-Module(body=[ClassDef(name='X', bases=[], keywords=[], body=[Pass()], decorator_list=[], type_params=[TypeVar(name='T', bound=None, default_value=None), ..., ParamSpec(name='P', default_value=None)], builder=None)], type_ignores=[])
-Module(body=[ClassDef(name='X', bases=[], keywords=[], body=[Pass()], decorator_list=[], type_params=[TypeVar(name='T', bound=Name(...), default_value=None), ..., ParamSpec(name='P', default_value=None)], builder=None)], type_ignores=[])
-Module(body=[ClassDef(name='X', bases=[], keywords=[], body=[Pass()], decorator_list=[], type_params=[TypeVar(name='T', bound=Tuple(...), default_value=None), ..., ParamSpec(name='P', default_value=None)], builder=None)], type_ignores=[])
-Module(body=[ClassDef(name='X', bases=[], keywords=[], body=[Pass()], decorator_list=[], type_params=[TypeVar(name='T', bound=Name(...), default_value=Constant(...)), ..., ParamSpec(name='P', default_value=Constant(...))], builder=None)], type_ignores=[])
+Module(body=[ClassDef(name='X', bases=[], keywords=[], body=[Pass()], decorator_list=[], type_params=[TypeVar(name='T', bound=None, default_value=None)], maker=None)], type_ignores=[])
+Module(body=[ClassDef(name='X', bases=[], keywords=[], body=[Pass()], decorator_list=[], type_params=[TypeVar(name='T', bound=None, default_value=None), ..., ParamSpec(name='P', default_value=None)], maker=None)], type_ignores=[])
+Module(body=[ClassDef(name='X', bases=[], keywords=[], body=[Pass()], decorator_list=[], type_params=[TypeVar(name='T', bound=Name(...), default_value=None), ..., ParamSpec(name='P', default_value=None)], maker=None)], type_ignores=[])
+Module(body=[ClassDef(name='X', bases=[], keywords=[], body=[Pass()], decorator_list=[], type_params=[TypeVar(name='T', bound=Tuple(...), default_value=None), ..., ParamSpec(name='P', default_value=None)], maker=None)], type_ignores=[])
+Module(body=[ClassDef(name='X', bases=[], keywords=[], body=[Pass()], decorator_list=[], type_params=[TypeVar(name='T', bound=Name(...), default_value=Constant(...)), ..., ParamSpec(name='P', default_value=Constant(...))], maker=None)], type_ignores=[])
 Module(body=[FunctionDef(name='f', args=arguments(posonlyargs=[], args=[], vararg=None, kwonlyargs=[], kw_defaults=[], kwarg=None, defaults=[]), body=[Pass()], decorator_list=[], returns=None, type_comment=None, type_params=[TypeVar(name='T', bound=None, default_value=None)])], type_ignores=[])
 Module(body=[FunctionDef(name='f', args=arguments(posonlyargs=[], args=[], vararg=None, kwonlyargs=[], kw_defaults=[], kwarg=None, defaults=[]), body=[Pass()], decorator_list=[], returns=None, type_comment=None, type_params=[TypeVar(name='T', bound=None, default_value=None), ..., ParamSpec(name='P', default_value=None)])], type_ignores=[])
 Module(body=[FunctionDef(name='f', args=arguments(posonlyargs=[], args=[], vararg=None, kwonlyargs=[], kw_defaults=[], kwarg=None, defaults=[]), body=[Pass()], decorator_list=[], returns=None, type_comment=None, type_params=[TypeVar(name='T', bound=Name(...), default_value=None), ..., ParamSpec(name='P', default_value=None)])], type_ignores=[])