Commit b37ec6e3 authored by BO ZHANG's avatar BO ZHANG 🏀
Browse files

resolve conflicts in time module

parent 96d94e4e
...@@ -3,7 +3,7 @@ import time ...@@ -3,7 +3,7 @@ import time
import traceback import traceback
from collections import namedtuple from collections import namedtuple
from astropy import time from astropy.time import Time
from csst_common.data_manager import CsstMsDataManager from csst_common.data_manager import CsstMsDataManager
from csst_common.file_recorder import FileRecorder from csst_common.file_recorder import FileRecorder
...@@ -93,7 +93,7 @@ def module_wrapper(func): ...@@ -93,7 +93,7 @@ def module_wrapper(func):
# write time stamp # write time stamp
if tstamp is not None: if tstamp is not None:
with open(tstamp, "a+") as f: with open(tstamp, "a+") as f:
f.write(f"{time.Time.now().isot}+08:00\n") f.write(f"{Time.now().isot}+08:00\n")
return ModuleResult(func.__name__, t_cost, status, fr, output) return ModuleResult(func.__name__, t_cost, status, fr, output)
return call_module return call_module
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment