From b37ec6e371e3c30bd3794e0eb09491a82c8a9c7d Mon Sep 17 00:00:00 2001
From: BO ZHANG <bozhang@nao.cas.cn>
Date: Mon, 26 Jun 2023 15:22:03 +0800
Subject: [PATCH] resolve conflicts in time module

---
 csst_common/wrapper.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/csst_common/wrapper.py b/csst_common/wrapper.py
index 525f6b5..368a2b0 100644
--- a/csst_common/wrapper.py
+++ b/csst_common/wrapper.py
@@ -3,7 +3,7 @@ import time
 import traceback
 from collections import namedtuple
 
-from astropy import time
+from astropy.time import Time
 
 from csst_common.data_manager import CsstMsDataManager
 from csst_common.file_recorder import FileRecorder
@@ -93,7 +93,7 @@ def module_wrapper(func):
             # write time stamp
             if tstamp is not None:
                 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 call_module
-- 
GitLab