diff --git a/python/GafferDispatch/LocalDispatcher.py b/python/GafferDispatch/LocalDispatcher.py index bb82e151f70..62f01806978 100644 --- a/python/GafferDispatch/LocalDispatcher.py +++ b/python/GafferDispatch/LocalDispatcher.py @@ -96,7 +96,7 @@ def __init__( self, batch, dispatcher ) : ) self.__executeInBackground = dispatcher["executeInBackground"].getValue() - self.__startTime = datetime.datetime.now() + self.__startTime = datetime.datetime.now( datetime.timezone.utc ) self.__endTime = None self.__messageHandler = _MessageHandler() @@ -140,7 +140,7 @@ def runningTime( self ) : if self.__endTime is not None : return self.__endTime - self.__startTime else : - return datetime.datetime.now() - self.__startTime + return datetime.datetime.now( datetime.timezone.utc ) - self.__startTime def processID( self ) : @@ -384,7 +384,7 @@ def __updateStatus( self, status ) : self.__status = status if status in ( self.Status.Complete, self.Status.Failed, self.Status.Killed ) : - self.__endTime = datetime.datetime.now() + self.__endTime = datetime.datetime.now( datetime.timezone.utc ) if threading.current_thread() is threading.main_thread() : self.__emitStatusChanged() diff --git a/python/GafferDispatchUI/LocalJobs.py b/python/GafferDispatchUI/LocalJobs.py index b386ce9f150..5981a5b8005 100644 --- a/python/GafferDispatchUI/LocalJobs.py +++ b/python/GafferDispatchUI/LocalJobs.py @@ -341,7 +341,7 @@ def soleFormat( values ) : value = sole( values ) if value is not None : if isinstance( value, datetime.datetime ) : - return "{:%a %b %d %H:%M:%S}".format( value ) + return "{:%a %b %d %H:%M:%S}".format( value.astimezone() ) else : return str( value ) else :