feat: allow use of type as a attribute name

Author: autumnjolitz

instruct/templates/macros.jinja

@@ -4,12 +4,12 @@ def make_getter(type_def):
     Factory function that allows the metaclass to pass
     data into this context (like type definitions).
     '''
-    def {{field_name}}(self) -> type_def:
+    def _get_{{field_name}}(self) -> type_def:
         '''
         Autogenerated code: Setter function for {{field_name}}.
         '''
         {{get_variable_template|format(key=field_name)|indent(8)}}
-    return {{field_name}}
+    return _get_{{field_name}}
 {% endmacro %}
 
 {% macro setter_func_template(field_name, setter_variable_template, on_sets=None, has_coercion=False) %}
@@ -22,7 +22,7 @@ def make_setter(type_def, fast, derived, type_restriction, coerce_types=(), coer
         'Not all types {!r} are cls'.format(type_restriction)
 
     if fast:
-        def {{field_name}}(self, val: type_def) -> NoneType:
+        def _set_{{field_name}}(self, val: type_def) -> NoneType:
             {%- if has_coercion %}
             if isinstance(val, coerce_types):
                 val = coerce_func(val)
@@ -34,7 +34,7 @@ def make_setter(type_def, fast, derived, type_restriction, coerce_types=(), coer
             {%- endfor %}
             {%- endif %}
     else:
-        def {{field_name}}(self, val: type_def) -> NoneType:
+        def _set_{{field_name}}(self, val: type_def) -> NoneType:
             if not isinstance(val, type_restriction):
                 if isinstance(val, dict) and derived is not None:
                     val = derived(**val)
@@ -54,7 +54,7 @@ def make_setter(type_def, fast, derived, type_restriction, coerce_types=(), coer
             {%- endfor %}
             {%- endif %}
 
-    return {{field_name}}
+    return _set_{{field_name}}
 {% endmacro %}
 
 {% macro history_setter_variable_template(field_name, setter_variable_template) %}