Merge branch 'develop' into MR/newapi

Author: cubicibo

src/timecode/timecode.py

@@ -552,13 +552,16 @@ def __eq__(self, other: int | str | Timecode | object) -> bool:
             bool: True if the other is equal to this Timecode instance.
         """
         if isinstance(other, Timecode):
-            return self.framerate == other.framerate and self.frames == other.frames
+            if self.framerate != other.framerate:
+                raise ValueError("'==' not supported between instances of "
+                                 "'Timecode' with different framerates")
+            return self.frames == other.frames
         if isinstance(other, str):
             new_tc = Timecode(self.framerate, other)
             return self.__eq__(new_tc)
         if isinstance(other, int):
             return self.frames == other
-        return False
+        return NotImplemented
 
     def __ge__(self, other: int | str | Timecode | object) -> bool:
         """Override greater than or equal to operator.
@@ -574,16 +577,16 @@ def __ge__(self, other: int | str | Timecode | object) -> bool:
                 instance.
         """
         if isinstance(other, Timecode):
-            return self.framerate == other.framerate and self.frames >= other.frames
+            if self.framerate != other.framerate:
+                raise ValueError("'>=' not supported between instances of "
+                                 "'Timecode' with different framerates")
+            return self.frames >= other.frames
         if isinstance(other, str):
             new_tc = Timecode(self.framerate, other)
             return self.frames >= new_tc.frames
         if isinstance(other, int):
             return self.frames >= other
-        raise TypeError(
-            "'>=' not supported between instances of 'Timecode' and "
-            f"'{other.__class__.__name__}'"
-        )
+        return NotImplemented
 
     def __gt__(self, other: int | str | Timecode) -> bool:
         """Override greater than operator.
@@ -598,16 +601,16 @@ def __gt__(self, other: int | str | Timecode) -> bool:
             bool: True if the other is greater than this Timecode instance.
         """
         if isinstance(other, Timecode):
-            return self.framerate == other.framerate and self.frames > other.frames
+            if self.framerate != other.framerate:
+                raise ValueError("'>' not supported between instances of "
+                                 "'Timecode' with different framerates")
+            return self.frames > other.frames
         if isinstance(other, str):
             new_tc = Timecode(self.framerate, other)
             return self.frames > new_tc.frames
         if isinstance(other, int):
             return self.frames > other
-        raise TypeError(
-            "'>' not supported between instances of 'Timecode' and "
-            f"'{other.__class__.__name__}'"
-        )
+        return NotImplemented
 
     def __le__(self, other: int | str | Timecode | object) -> bool:
         """Override less or equal to operator.
@@ -622,16 +625,16 @@ def __le__(self, other: int | str | Timecode | object) -> bool:
             bool: True if the other is less than or equal to this Timecode instance.
         """
         if isinstance(other, Timecode):
-            return self.framerate == other.framerate and self.frames <= other.frames
+            if self.framerate != other.framerate:
+                raise ValueError("'<=' not supported between instances of "
+                                 "'Timecode' with different framerates")
+            return self.frames <= other.frames
         if isinstance(other, str):
             new_tc = Timecode(self.framerate, other)
             return self.frames <= new_tc.frames
         if isinstance(other, int):
             return self.frames <= other
-        raise TypeError(
-            "'<' not supported between instances of 'Timecode' and "
-            f"'{other.__class__.__name__}'"
-        )
+        return NotImplemented
 
     def __lt__(self, other: int | str | Timecode) -> bool:
         """Override less than operator.
@@ -646,16 +649,16 @@ def __lt__(self, other: int | str | Timecode) -> bool:
             bool: True if the other is less than this Timecode instance.
         """
         if isinstance(other, Timecode):
+            if self.framerate != other.framerate:
+                raise ValueError("'<' not supported between instances of "
+                                 "'Timecode' with different framerates")
             return self.framerate == other.framerate and self.frames < other.frames
         if isinstance(other, str):
             new_tc = Timecode(self.framerate, other)
             return self.frames < new_tc.frames
         if isinstance(other, int):
             return self.frames < other
-        raise TypeError(
-            "'<=' not supported between instances of 'Timecode' and "
-            f"'{other.__class__.__name__}'"
-        )
+        return NotImplemented
 
     def __add__(self, other: int | Timecode) -> Timecode:
         """Return a new Timecode with the given timecode or frames added to this one.
@@ -679,9 +682,7 @@ def __add__(self, other: int | Timecode) -> Timecode:
         elif isinstance(other, int):
             tc.add_frames(other)
         else:
-            raise TimecodeError(
-                f"Type {other.__class__.__name__} not supported for arithmetic."
-            )
+            return NotImplemented
 
         return tc
 
@@ -703,9 +704,7 @@ def __sub__(self, other: int | Timecode) -> Timecode:
         elif isinstance(other, int):
             subtracted_frames = self.frames - other
         else:
-            raise TimecodeError(
-                f"Type {other.__class__.__name__} not supported for arithmetic."
-            )
+            return NotImplemented
         tc = Timecode(self.framerate, frames=abs(subtracted_frames))
         tc._copy_props_from(self)
         return tc
@@ -728,9 +727,7 @@ def __mul__(self, other: int | Timecode) -> Timecode:
         elif isinstance(other, int):
             multiplied_frames = self.frames * other
         else:
-            raise TimecodeError(
-                f"Type {other.__class__.__name__} not supported for arithmetic."
-            )
+            return NotImplemented
         tc = Timecode(self.framerate, frames=multiplied_frames)
         tc._copy_props_from(self)
         return tc
@@ -753,9 +750,7 @@ def __div__(self, other: int | Timecode) -> Timecode:
         elif isinstance(other, int):
             div_frames = int(self.frames / other)
         else:
-            raise TimecodeError(
-                f"Type {other.__class__.__name__} not supported for arithmetic."
-            )
+            return NotImplemented
         tc = Timecode(self.framerate, frames=div_frames)
         tc._copy_props_from(self)
         return tc

tests/test_timecode.py

@@ -1017,21 +1017,31 @@ def test_add_with_two_different_frame_rates():
     [
         [["24", "00:00:01:00"], {}, lambda x, y: x + y, "not suitable"],
         [["24", "00:00:01:00"], {}, lambda x, y: x - y, "not suitable"],
-        [["24", "00:00:01:00"], {}, lambda x, y: x * y, "not suitable"],
         [["24", "00:00:01:00"], {}, lambda x, y: x / y, "not suitable"],
         [["24", "00:00:01:00"], {}, lambda x, y: x / y, 32.4],
-    ],
+        [["24", "00:00:01:00"], {}, lambda x, y: x * y, 32.4],
+    ]
 )
-def test_arithmetic_with_unsupported_type_raises_error(args, kwargs, func, tc2):
-    """TimecodeError is raised if the other class is not suitable for the operation."""
+def test_arithmetic_with_non_suitable_class_instance(args, kwargs, func, tc2):
+    """TypeError is raised if the other class is not suitable for the operation."""
     tc1 = Timecode(*args, **kwargs)
-    with pytest.raises(TimecodeError) as cm:
+    with pytest.raises(TypeError) as cm:
         _ = func(tc1, tc2)
 
-    assert str(cm.value) == "Type {} not supported for arithmetic.".format(
-        tc2.__class__.__name__
-    )
+    assert str(cm.value).startswith(f"unsupported operand type(s) for")
+    assert str(cm.value).endswith(f"'Timecode' and '{tc2.__class__.__name__}'")
 
+@pytest.mark.parametrize(
+    "args,kwargs,func,tc2", [
+        [["24", "00:00:01:00"], {}, lambda x, y: x * y, "not suitable"],
+    ]
+)
+def test_multiply_with_sequence_type(args, kwargs, func, tc2):
+    """TypeError is raised if the other class is not suitable for the operation."""
+    tc1 = Timecode(*args, **kwargs)
+    with pytest.raises(TypeError) as cm:
+        _ = func(tc1, tc2)
+    assert str(cm.value) == (f"can't multiply sequence by non-int of type 'Timecode'")
 
 def test_div_method_working_properly_1():
     """__div__ method is working properly."""
@@ -1247,12 +1257,6 @@ def test_ms_vs_fraction_frames_2():
 
 
 def test_ms_vs_fraction_frames_3():
-    tc1 = Timecode("ms", "00:00:00.040")
-    tc2 = Timecode(24, "00:00:00.042")
-    assert tc1 != tc2
-
-
-def test_ms_vs_fraction_frames_4():
     tc1 = Timecode("ms", "00:00:00.040")
     tc2 = Timecode(24, "00:00:00.042")
     assert tc1.frame_number == 40
@@ -1610,6 +1614,14 @@ def test_lt_method_with_integers():
     tc = Timecode("24", "00:00:10:00")
     assert tc < 250
 
+def test_comparison_with_different_framerates_raises():
+    """Comparing Timecodes with different framerates."""
+    tc1 = Timecode("24", "00:00:00:00")
+    tc2 = Timecode("30", "00:00:00:00")
+    with pytest.raises(ValueError) as cm:
+        _ = tc1 < tc2
+        _ = tc1 > tc2
+
 
 def test_fraction_lib_from_python3_raises_import_error_for_python2():
     """ImportError is raised and the error is handled gracefully under Python 2 if