Add type check when convert datetime to Timestamp and convert timedelta to duration.

The original code may raises AttributeError when assign wrong type to Timestamp/Duration. Will raise TypeError instead.

PiperOrigin-RevId: 797464099

Author: anandolee

python/google/protobuf/internal/duration_test.py

@@ -93,6 +93,11 @@ def test_duration_add_annotation(self):
     # Duration + Duration
     self.assertEqual(dr + dr2, dr2 + dr)
 
+  def test_assign_datetime_to_duration(self):
+    message = well_known_types_test_pb2.WKTMessage()
+    with self.assertRaises(TypeError):
+      message.optional_duration = datetime.datetime.now()
+
 
 if __name__ == '__main__':
   unittest.main()

python/google/protobuf/internal/timestamp_test.py

@@ -90,6 +90,11 @@ def test_timestamp_add_annotation(self):
     # Timestamp + Duration and Duration + Timestamp
     self.assertEqual(ts + msg.optional_duration, msg.optional_duration + ts)
 
+  def test_assign_duration_to_timestamp(self):
+    message = well_known_types_test_pb2.WKTMessage()
+    with self.assertRaises(TypeError):
+      message.optional_timestamp = datetime.timedelta(microseconds=123)
+
 
 if __name__ == '__main__':
   unittest.main()

python/google/protobuf/internal/well_known_types.py

@@ -279,14 +279,13 @@ def FromDatetime(self, dt):
     # manipulated into a long value of seconds.  During the conversion from
     # struct_time to long, the source date in UTC, and so it follows that the
     # correct transformation is calendar.timegm()
-    try:
-      seconds = calendar.timegm(dt.utctimetuple())
-      nanos = dt.microsecond * _NANOS_PER_MICROSECOND
-    except AttributeError as e:
-      raise AttributeError(
-          'Fail to convert to Timestamp. Expected a datetime like '
-          'object got {0} : {1}'.format(type(dt).__name__, e)
-      ) from e
+    if not isinstance(dt, datetime.datetime):
+      raise TypeError(
+          'Fail to convert to Timestamp. Expected a datetime object '
+          'got {0}'.format(type(dt).__name__)
+      )
+    seconds = calendar.timegm(dt.utctimetuple())
+    nanos = dt.microsecond * _NANOS_PER_MICROSECOND
     _CheckTimestampValid(seconds, nanos)
     self.seconds = seconds
     self.nanos = nanos
@@ -445,16 +444,15 @@ def ToTimedelta(self) -> datetime.timedelta:
 
   def FromTimedelta(self, td):
     """Converts timedelta to Duration."""
-    try:
-      self._NormalizeDuration(
-          td.seconds + td.days * _SECONDS_PER_DAY,
-          td.microseconds * _NANOS_PER_MICROSECOND,
+    if not isinstance(td, datetime.timedelta):
+      raise TypeError(
+          'Fail to convert to Duration. Expected a timedelta object '
+          'got {0}'.format(type(td).__name__)
       )
-    except AttributeError as e:
-      raise AttributeError(
-          'Fail to convert to Duration. Expected a timedelta like '
-          'object got {0}: {1}'.format(type(td).__name__, e)
-      ) from e
+    self._NormalizeDuration(
+        td.seconds + td.days * _SECONDS_PER_DAY,
+        td.microseconds * _NANOS_PER_MICROSECOND,
+    )
 
   def _internal_assign(self, td):
     self.FromTimedelta(td)

python/google/protobuf/internal/well_known_types_test.py

@@ -540,10 +540,10 @@ def testInvalidTimestamp(self):
     self.assertRaisesRegex(ValueError, 'Timestamp is not valid',
                            message.FromSeconds, -62135596801)
     msg = well_known_types_test_pb2.WKTMessage()
-    with self.assertRaises(AttributeError):
+    with self.assertRaises(TypeError):
       msg.optional_timestamp = 1
 
-    with self.assertRaises(AttributeError):
+    with self.assertRaises(TypeError):
       msg2 = well_known_types_test_pb2.WKTMessage(optional_timestamp=1)
 
     with self.assertRaises(TypeError):
@@ -606,10 +606,10 @@ def testInvalidDuration(self):
         message.ToJsonString,
     )
     msg = well_known_types_test_pb2.WKTMessage()
-    with self.assertRaises(AttributeError):
+    with self.assertRaises(TypeError):
       msg.optional_duration = 1
 
-    with self.assertRaises(AttributeError):
+    with self.assertRaises(TypeError):
       msg2 = well_known_types_test_pb2.WKTMessage(optional_duration=1)
 
     with self.assertRaises(TypeError):