projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '18682-use-keyrings-instead-of-key-ids'
[arvados.git]
/
services
/
fuse
/
arvados_fuse
/
fresh.py
diff --git
a/services/fuse/arvados_fuse/fresh.py
b/services/fuse/arvados_fuse/fresh.py
index 2a3a19c54c66005a6f96cd8d1dbd6de3c6345aad..53214ee94d70b214f79e3cca5c5193a41ebe2567 100644
(file)
--- a/
services/fuse/arvados_fuse/fresh.py
+++ b/
services/fuse/arvados_fuse/fresh.py
@@
-2,6
+2,7
@@
#
# SPDX-License-Identifier: AGPL-3.0
#
# SPDX-License-Identifier: AGPL-3.0
+from builtins import object
import time
import ciso8601
import calendar
import time
import ciso8601
import calendar
@@
-12,7
+13,7
@@
def convertTime(t):
if not t:
return 0
try:
if not t:
return 0
try:
- return calendar.timegm(ciso8601.parse_datetime_
unawar
e(t).timetuple())
+ return calendar.timegm(ciso8601.parse_datetime_
as_naiv
e(t).timetuple())
except (TypeError, ValueError):
return 0
except (TypeError, ValueError):
return 0