sardana-nxsrecorder 3.26.0__py3-none-any.whl → 3.26.1__py3-none-any.whl

{sardana_nxsrecorder-3.26.0.dist-info → sardana_nxsrecorder-3.26.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sardana-nxsrecorder
-Version: 3.26.0
+Version: 3.26.1
 Summary: NeXus Sardana Scan Recorder
 Home-page: https://github.com/nexdatas/sardana-nxs-filerecorder/
 Author: Jan Kotanski

sardana_nxsrecorder-3.26.1.dist-info/RECORD

@@ -0,0 +1,6 @@
+sardananxsrecorder/__init__.py,sha256=D9XnMblVPsgwwr6BjPz877oQCWyEj1GqmL7nb3JAb70,896
+sardananxsrecorder/nxsrecorder.py,sha256=bS7vevRyLtPgz7zoK2XJid9XCTgdKAeJRZb-QK2Nl5g,58343
+sardana_nxsrecorder-3.26.1.dist-info/METADATA,sha256=Y56-3gdsv1UknXfjr8uyMUPVinvmbEYF_Ev-CqHlzCk,8035
+sardana_nxsrecorder-3.26.1.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+sardana_nxsrecorder-3.26.1.dist-info/top_level.txt,sha256=YdD3m417i-jlYyQWgiizgZ8lQQcOjM8y-bmUHrGkfY4,19
+sardana_nxsrecorder-3.26.1.dist-info/RECORD,,

sardananxsrecorder/__init__.py

@@ -20,4 +20,4 @@
 """ Sardana Scan Recorders """
 
 #: package version
-__version__ = "3.26.0"
+__version__ = "3.26.1"

sardananxsrecorder/nxsrecorder.py

@@ -26,7 +26,6 @@ import sys
 
 import numpy
 import json
-import pytz
 import time
 import weakref
 import socket
@@ -1175,8 +1174,16 @@ class NXS_FileRecorder(BaseFileRecorder):
         :returns: formatted time string
         :rtype: :obj:`str`
         """
+        fmt = '%Y-%m-%dT%H:%M:%S.%f%z'
         try:
-            tz = pytz.timezone(tzone)
+            if sys.version_info >= (3, 9):
+                import zoneinfo
+                tz = zoneinfo.ZoneInfo(tzone)
+                starttime = mtime.replace(tzinfo=tz)
+            else:
+                import pytz
+                tz = pytz.timezone(tzone)
+                starttime = tz.localize(mtime)
         except Exception:
             self.warning(
                 "Wrong TimeZone. "
@@ -1185,13 +1192,15 @@ class NXS_FileRecorder(BaseFileRecorder):
                 self.__macro().warning(
                     "Wrong TimeZone. "
                     "The time zone set to `%s`" % self.__timezone)
-            tz = pytz.timezone(self.__timezone)
+            if sys.version_info >= (3, 9):
+                import zoneinfo
+                tz = zoneinfo.ZoneInfo(self.__timezone)
+                starttime = mtime.replace(tzinfo=tz)
+            else:
+                import pytz
+                tz = pytz.timezone(self.__timezone)
+                starttime = tz.localize(mtime)
 
-        fmt = '%Y-%m-%dT%H:%M:%S.%f%z'
-        if sys.version_info > (3, 6):
-            starttime = mtime.replace(tzinfo=tz)
-        else:
-            starttime = tz.localize(mtime)
         return str(starttime.strftime(fmt))
 
     def _endRecordList(self, recordlist):

sardana_nxsrecorder-3.26.0.dist-info/RECORD

@@ -1,6 +0,0 @@
-sardananxsrecorder/__init__.py,sha256=GktUxiQNBhdbje4E9WlYbikp7LfZxiGHRK8eBCiEf1U,896
-sardananxsrecorder/nxsrecorder.py,sha256=n8QAbHwDbcJzHgFzR2wDhL9sdEBMqhj33T6BdKXyNvs,57947
-sardana_nxsrecorder-3.26.0.dist-info/METADATA,sha256=1JlJrVuAujdNy7IUw-tKBo3OKAYpcPH5YnDwNExBuYA,8035
-sardana_nxsrecorder-3.26.0.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-sardana_nxsrecorder-3.26.0.dist-info/top_level.txt,sha256=YdD3m417i-jlYyQWgiizgZ8lQQcOjM8y-bmUHrGkfY4,19
-sardana_nxsrecorder-3.26.0.dist-info/RECORD,,