sardana-nxsrecorder 3.17.0__py3-none-any.whl → 3.17.2__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {sardana_nxsrecorder-3.17.0.dist-info → sardana_nxsrecorder-3.17.2.dist-info}/METADATA +1 -1
- sardana_nxsrecorder-3.17.2.dist-info/RECORD +6 -0
- sardananxsrecorder/__init__.py +1 -1
- sardananxsrecorder/nxsrecorder.py +9 -7
- sardana_nxsrecorder-3.17.0.dist-info/RECORD +0 -6
- {sardana_nxsrecorder-3.17.0.dist-info → sardana_nxsrecorder-3.17.2.dist-info}/WHEEL +0 -0
- {sardana_nxsrecorder-3.17.0.dist-info → sardana_nxsrecorder-3.17.2.dist-info}/top_level.txt +0 -0
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
sardananxsrecorder/__init__.py,sha256=YLuHTLEs3td4H11O-9JYirDoMX6W9xxdg1xobaAFI58,896
|
|
2
|
+
sardananxsrecorder/nxsrecorder.py,sha256=KPqnWgCt9v0mnYILHibwkK4FlRRWtuzvvgQNQDm-0P0,48088
|
|
3
|
+
sardana_nxsrecorder-3.17.2.dist-info/METADATA,sha256=EfGwmgVpJRAFKxvKfl0hvNiiDf9gFkDQ8uqz1w5Of4I,7181
|
|
4
|
+
sardana_nxsrecorder-3.17.2.dist-info/WHEEL,sha256=g4nMs7d-Xl9-xC9XovUrsDHGXt-FT0E17Yqo92DEfvY,92
|
|
5
|
+
sardana_nxsrecorder-3.17.2.dist-info/top_level.txt,sha256=YdD3m417i-jlYyQWgiizgZ8lQQcOjM8y-bmUHrGkfY4,19
|
|
6
|
+
sardana_nxsrecorder-3.17.2.dist-info/RECORD,,
|
sardananxsrecorder/__init__.py
CHANGED
|
@@ -1011,13 +1011,14 @@ class NXS_FileRecorder(BaseFileRecorder):
|
|
|
1011
1011
|
if not isinstance(self.__udata, dict):
|
|
1012
1012
|
if 'MetadataScript' in self.__env.keys():
|
|
1013
1013
|
msf = self.__env['MetadataScript']
|
|
1014
|
-
elif 'FioAdditions' in self.__env.keys():
|
|
1015
|
-
|
|
1014
|
+
# elif 'FioAdditions' in self.__env.keys():
|
|
1015
|
+
# msf = self.__env['FioAdditions']
|
|
1016
1016
|
if msf:
|
|
1017
1017
|
if not os.path.exists(msf):
|
|
1018
1018
|
self.warning("NXS_FileRecorder: %s does not exist" % msf)
|
|
1019
|
-
self.
|
|
1020
|
-
|
|
1019
|
+
if self.__macro:
|
|
1020
|
+
self.__macro().warning(
|
|
1021
|
+
"NXS_FileRecorder: %s does not exist" % msf)
|
|
1021
1022
|
else:
|
|
1022
1023
|
import imp
|
|
1023
1024
|
msm = imp.load_source('', msf)
|
|
@@ -1025,9 +1026,10 @@ class NXS_FileRecorder(BaseFileRecorder):
|
|
|
1025
1026
|
if not isinstance(ms, dict):
|
|
1026
1027
|
self.warning(
|
|
1027
1028
|
"NXS_FileRecorder: bad output from %s" % msf)
|
|
1028
|
-
self.
|
|
1029
|
-
|
|
1030
|
-
|
|
1029
|
+
if self.__macro:
|
|
1030
|
+
self.__macro().warning(
|
|
1031
|
+
"NXS_FileRecorder: bad output from %s" % msf)
|
|
1032
|
+
self.__udata = {}
|
|
1031
1033
|
else:
|
|
1032
1034
|
self.__udata = ms
|
|
1033
1035
|
if isinstance(self.__udata, dict) and isinstance(ms, dict):
|
|
@@ -1,6 +0,0 @@
|
|
|
1
|
-
sardananxsrecorder/__init__.py,sha256=dq9sOUKpe6oe_b-Jhto6XTa06CwqFfBskLNofpnR0bM,896
|
|
2
|
-
sardananxsrecorder/nxsrecorder.py,sha256=SVXyjQiokMPlTYHz3YWfb31recQxTAGao73Q7MJDopQ,47988
|
|
3
|
-
sardana_nxsrecorder-3.17.0.dist-info/METADATA,sha256=rAziENFx-cp8r-153W_I4dRkhSEjNXthX5SlaPDg924,7181
|
|
4
|
-
sardana_nxsrecorder-3.17.0.dist-info/WHEEL,sha256=g4nMs7d-Xl9-xC9XovUrsDHGXt-FT0E17Yqo92DEfvY,92
|
|
5
|
-
sardana_nxsrecorder-3.17.0.dist-info/top_level.txt,sha256=YdD3m417i-jlYyQWgiizgZ8lQQcOjM8y-bmUHrGkfY4,19
|
|
6
|
-
sardana_nxsrecorder-3.17.0.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|