@@ -398,57 +398,45 @@ def get_raw(self):
398398 """
399399 return self .activity
400400
401- def get_last_successful_login (self , as_date = False ):
401+ @property
402+ def last_successful_login (self ):
402403 """
403- Get the last successful login of the user as a timestamp or as a :class:`datetime.datetime`
404+ Get the last successful login of the user as a :class:`datetime.datetime`
404405
405406 Returns None if there were no successful login for this user.
406407
407408 :return: the last successful login
408- :rtype: int or :class:`datetime.datetime` or None
409+ :rtype: :class:`datetime.datetime` or None
409410 """
410411 timestamp = self .activity ["lastSuccessfulLogin" ]
411- if timestamp == 0 :
412- return None
413- elif as_date :
414- return datetime .datetime .fromtimestamp (timestamp / 1000 )
415- else :
416- return timestamp
412+ return datetime .datetime .fromtimestamp (timestamp / 1000 ) if timestamp > 0 else None
417413
418- def get_last_failed_login (self , as_date = False ):
414+ @property
415+ def last_failed_login (self ):
419416 """
420- Get the last failed login of the user as a timestamp or as a :class:`datetime.datetime`
417+ Get the last failed login of the user as a :class:`datetime.datetime`
421418
422419 Returns None if there were no failed login for this user.
423420
424421 :return: the last failed login
425- :rtype: int or :class:`datetime.datetime` or None
422+ :rtype: :class:`datetime.datetime` or None
426423 """
427424 timestamp = self .activity ["lastFailedLogin" ]
428- if timestamp == 0 :
429- return None
430- elif as_date :
431- return datetime .datetime .fromtimestamp (timestamp / 1000 )
432- else :
433- return timestamp
425+ return datetime .datetime .fromtimestamp (timestamp / 1000 ) if timestamp > 0 else None
434426
435- def get_last_session_activity (self , as_date = False ):
427+ @property
428+ def last_session_activity (self ):
436429 """
437- Get the last session activity of the user as a timestamp or as a :class:`datetime.datetime`, i.e. the last time
430+ Get the last session activity of the user as a :class:`datetime.datetime`, i.e. the last time
438431 he opened a new DSS tab or refreshed his session.
439432
440433 Returns None if there is no session activity yet.
441434
442435 :return: the last session activity
443- :rtype: int or :class:`datetime.datetime` or None
436+ :rtype: :class:`datetime.datetime` or None
444437 """
445438 timestamp = self .activity ["lastSessionActivity" ]
446- if timestamp == 0 :
447- return None
448- elif as_date :
449- return datetime .datetime .fromtimestamp (timestamp / 1000 )
450- else :
451- return timestamp
439+ return datetime .datetime .fromtimestamp (timestamp / 1000 ) if timestamp > 0 else None
452440
453441
454442class DSSGroup (object ):
0 commit comments