pymodaq_data 0.0.3__tar.gz → 5.0.2__tar.gz

{pymodaq_data-0.0.3 → pymodaq_data-5.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pymodaq_data
-Version: 0.0.3
+Version: 5.0.2
 Summary: Modular Data Acquisition with Python
 Project-URL: Homepage, http://pymodaq.cnrs.fr
 Project-URL: Source, https://github.com/PyMoDAQ/PyMoDAQ

{pymodaq_data-0.0.3 → pymodaq_data-5.0.2}/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.0.3'
-__version_tuple__ = version_tuple = (0, 0, 3)
+__version__ = version = '5.0.2'
+__version_tuple__ = version_tuple = (5, 0, 2)

{pymodaq_data-0.0.3 → pymodaq_data-5.0.2}/src/pymodaq_data/data.py

@@ -765,7 +765,7 @@ class DataBase(DataLowLevel, NDArrayOperatorsMixin):
 
     def _comparison_common(self, other, operator='__eq__'):
         if isinstance(other, DataBase):
-            if not (#self.name == other.name and  # who cares if the name is not the same?
+            if not (# no more checking for name equality
                     len(self) == len(other) and
                     Unit(self.units).is_compatible_with(other.units)):
                 return False
@@ -2759,7 +2759,15 @@ class DataToExport(DataLowLevel):
         return data
 
     def index(self, data: DataWithAxes):
-        return self.data.index(data)
+        """ Here use a comparison to assert data is equal to one element in the list
+
+        But the __eq__ method is not checking the name while it is the main issue for elt finding
+        Hence here I'm doing both checks
+        """
+        for ind, dwa in enumerate(self.data):
+            if dwa.name == data.name and dwa == data:
+                return ind
+        raise ValueError
 
     def index_from_name_origin(self, name: str, origin: str = '') -> List[DataWithAxes]:
         """Get the index of a given DataWithAxes within the list of data"""
@@ -2823,7 +2831,8 @@ class DataToExport(DataLowLevel):
     def append(self, dwa: DataWithAxes):
         """Append/replace DataWithAxes object to the data attribute
 
-        Make sure only one DataWithAxes object with a given name is in the list except if they don't have the same
+        Make sure only one DataWithAxes object with a given name is in the list except if they don't
+        have the same
         origin identifier
         """
         dwa = dwa.deepcopy()