#27: Fix timezone() propety getter function.

dicom4ortho/model.py

@@ -276,9 +276,20 @@ def timezone(self) -> datetime.timezone:
 
         :return: timezone from TimezoneOffsetFromUTC as a Python datetime.timezone object, or None if TimezoneOffsetFromUTC is not something that can be converted to an integer.
         """
+        tz_str = self._ds.TimezoneOffsetFromUTC
+        if tz_str is None or len(tz_str) < 5:
+            return None
+
         try:
-            return datetime.timezone(datetime.timedelta(hours=int(self._ds.TimezoneOffsetFromUTC)/100))
-        except (ValueError, TypeError):
+            # Extract hours and minutes from the string
+            sign = -1 if tz_str[0] == '-' else 1
+            hours = int(tz_str[1:3])
+            minutes = int(tz_str[3:5])
+
+            # Create a timedelta object
+            td = datetime.timedelta(hours=sign * hours, minutes=sign * minutes)
+            return datetime.timezone(td)
+        except ValueError:
             return None
 
     @ timezone.setter

test/test_models.py

@@ -62,11 +62,13 @@ class TestTimezoneSetterGetter(TestCase):
     def setUp(self):
         self.obj = DicomBase()  # Create an instance of your class
 
-    def test_set_timezone_bruteforce(self):
-        """ Tests for all possible timezones.
+    def test_set_TimezoneOffsetFromUTC(self):
+        """ Test if the DICOM TimezoneOffsetFromUTC is set properly.
+
+        Tests for all possible timezones.
         """
         for hours in range(-12, 13):  # from -12 to +12 inclusive
-            for minutes in [0, copysign(30,hours)]:  # checking on the hour and half-hour
+            for minutes in [0, int(copysign(30,hours))]:  # checking on the hour and half-hour
                 if abs(hours) == 12 and minutes != 0:
                     continue  # Skip the +12:30 and -12:30 cases
 
@@ -85,33 +87,23 @@ def test_set_timezone_bruteforce(self):
                 # Check if TimezoneOffsetFromUTC is set correctly
                 self.assertEqual(self.obj._ds.TimezoneOffsetFromUTC, expected_timezone)
 
-    def test_set_timezone2(self):
-        # Test setting a timezone
-        tz = datetime.timezone(datetime.timedelta(hours=-5, minutes=-30))
-        self.obj.timezone = tz
-
-        # Check the set value directly
-        set_tz = self.obj.timezone
-        expected_tz = tz
-
-        self.assertEqual(set_tz.utcoffset(None), expected_tz.utcoffset(None))
-
-    def test_get_timezone(self):
-        # Test getting a timezone
-        self.obj._ds.TimezoneOffsetFromUTC = "-0700"
-
-        tz = self.obj.timezone
-        expected_tz = datetime.timezone(datetime.timedelta(hours=-7))
+    def test_set_and_get_timezone(self):
+        """ Test if the timezone attribute properly returns the set timezone.
 
-        # Check if the getter retrieves the correct timezone
-        self.assertEqual(tz.utcoffset(None), expected_tz.utcoffset(None))
+        There is a different logic between the internal timezone setting and the DICOM TimezoneOffsetFromUTC.
+        """
+        for hours in range(-12, 13):  # from -12 to +12 inclusive
+            for minutes in [0, int(copysign(30,hours))]:  # checking on the hour and half-hour
+                if abs(hours) == 12 and minutes != 0:
+                    continue  # Skip the +12:30 and -12:30 cases
 
-    def test_set_and_get_timezone(self):
-        # Test setting and then getting a timezone
-        tz = datetime.timezone(datetime.timedelta(hours=3, minutes=15))
-        self.obj.timezone = tz
+                logging.info(f"Testing {hours}:{minutes}")
+                # Test setting a timezone
+                tz = datetime.timezone(datetime.timedelta(hours=hours, minutes=minutes))
+                self.obj.timezone = tz
 
-        retrieved_tz = self.obj.timezone
+                # Check the set value directly
+                set_tz = self.obj.timezone
+                expected_tz = tz
 
-        # Check if the setter and getter are consistent
-        self.assertEqual(retrieved_tz.utcoffset(None), tz.utcoffset(None))
+                self.assertEqual(set_tz.utcoffset(None), expected_tz.utcoffset(None),msg=f"Error while testing {hours}h {minutes}m")