Redo new copy implementation without need for flag

Author: freddieknets

tests/test_hybrid_class.py

@@ -339,8 +339,7 @@ class TD(xo.HybridClass):
             "_b": xo.Int64,
         }
         _skip_in_to_dict = ["_a", "_b"]
-        _store_in_to_dict = ["a", "b"]
-        _extra_fields_in_to_dict = ["c"]
+        _store_in_to_dict = ["a", "b", "c"]
 
         def __init__(self, **kwargs):
             if "_xobject" in kwargs and kwargs["_xobject"] is not None:
@@ -353,7 +352,7 @@ def __init__(self, **kwargs):
         def _initialize(self, **kwargs):
             # Need to handle non-xofields manually
             c = kwargs.pop("c", -9)
-            self.xoinitialize(**kwargs)
+            super().__init__(**kwargs)
             self._c = c
 
         @property

xobjects/hybrid_class.py

@@ -292,9 +292,7 @@ def to_dict(self, copy_to_cpu=True):
 
         skip_fields = set(getattr(obj, "_skip_in_to_dict", []))
         additional_fields = set(getattr(obj, "_store_in_to_dict", []))
-        extra_fields = set(getattr(obj, "_extra_fields_in_to_dict", []))
         fields_to_store = (set(obj._fields) - skip_fields) | additional_fields
-        fields_to_store |= extra_fields
 
         defaults = {}
         for field in obj._XoStruct._fields:
@@ -343,24 +341,18 @@ def copy(self, _context=None, _buffer=None, _offset=None):
         if _context is None and _buffer is None:
             _context = self._xobject._buffer.context
         # This makes a copy of the xobject
-        xobject = self._XoStruct(
+        new_xobject = self._XoStruct(
             self._xobject, _context=_context, _buffer=_buffer, _offset=_offset
         )
-        # Get the python-only attributes
-        additional_fields = set(getattr(self, "_extra_fields_in_to_dict", []))
-        python_kwargs = {}
-        for field in additional_fields:
-            vv = getattr(self, field)
-            if hasattr(vv, "copy"):
-                try:
-                    python_kwargs[field] = vv.copy(
-                        _context=_context, _buffer=_buffer, _offset=_offset
-                    )
-                except TypeError:
-                    python_kwargs[field] = vv.copy()
-            else:
-                python_kwargs[field] = vv
-        return self.__class__(_xobject=xobject, **python_kwargs)
+        new = self.__class__.__new__(self.__class__)
+        new.__dict__.update(self.__dict__)
+        for kk, vv in new.__dict__.items():
+            if kk == '_xobject':
+                continue
+            if hasattr(vv, 'copy'):
+                new.__dict__[kk] = vv.copy()
+        new._xobject = new_xobject
+        return new
 
     @property
     def _buffer(self):
@@ -407,8 +399,6 @@ def __repr__(self):
             if hasattr(self, "_add_to_repr"):
                 fnames += self._add_to_repr
             fnames += [fname for fname in self._fields]
-            if hasattr(self, "_extra_fields_in_to_dict"):
-                fnames += self._extra_fields_in_to_dict
             if hasattr(self, "_skip_in_repr"):
                 fnames = [ff for ff in fnames if ff not in self._skip_in_repr]