Fixes for typing errors

dftimewolf/lib/collectors/gcp_logging.py

@@ -44,8 +44,8 @@ def __init__(self,
     self._project_name = ''
     self._backoff = False
     self._delay = 0
-    self.start_time = None
-    self.end_time = None
+    self.start_time: Optional[datetime.datetime] = None
+    self.end_time: Optional[datetime.datetime] = None
 
   def OutputFile(self) -> Tuple[Any, str]:
     """Generate an output file name and path"""

dftimewolf/lib/validators/datetime_validator.py

@@ -33,7 +33,7 @@ def _EnsureTimezone(
     # If there's no timezone information, we assume it is UTC.
     if (parsed_datetime.tzinfo is None or
         parsed_datetime.tzinfo.utcoffset(parsed_datetime) is None):
-      parsed_datetime = parsed_datetime.replace(tzinfo=datetime.UTC)
+      parsed_datetime = parsed_datetime.replace(tzinfo=datetime.timezone.utc)
     return parsed_datetime
 
   def Validate(self, argument_value: Any,

tests/lib/args_validator.py

@@ -13,7 +13,7 @@
 class CommaSeparatedValidatorTest(unittest.TestCase):
   """Tests CommaSeparatedValidator."""
 
-  def testInit(self):
+  def testInit(self) -> None:
     """Tests initialization.
 
     Really, CommaSeparatedValidator is an abstract class so should never be
@@ -29,7 +29,7 @@ def testInit(self):
       mock_init.assert_called_once()
     # pylint: enable=unused-variable
 
-  def testValidate(self):
+  def testValidate(self) -> None:
     """Tests validation."""
     args_validator.CommaSeparatedValidator.__abstractmethods__=set()
 
@@ -63,7 +63,7 @@ def testValidate(self):
       self.assertEqual(mock_validatesingle.call_count, 1)
       self.assertEqual(val, 'one,two,three')
 
-  def testValidateFailure(self):
+  def testValidateFailure(self) -> None:
     """Tests validation failure."""
     def FailingValidateSingle(argument_value, _):
       if argument_value == 'three':