Merged in cbillington/lyse/python3 (pull request labscript-suite#41)

Python 3

Approved-by: Jan Werkmann <jan.wrk.fb@gmail.com>

Author: chrisjbillington

__init__.py

@@ -38,7 +38,7 @@
 # require pandas v0.15.0 up to the next major version
 check_version('pandas', '0.15.0', '1.0')
 check_version('zprocess', '2.2.0', '3.0')
-check_version('labscript_utils', '2.4', '3.0')
+check_version('labscript_utils', '2.6', '3.0')
 from labscript_utils import PY2
 if PY2:
     str = unicode
@@ -143,7 +143,7 @@ def set_group(self, groupname):
     def trace_names(self):
         with h5py.File(self.h5_path) as h5_file:
             try:
-                return h5_file['data']['traces'].keys()
+                return list(h5_file['data']['traces'].keys())
             except KeyError:
                 return []
 
@@ -176,7 +176,7 @@ def save_result(self, name, value, group=None, overwrite=True):
             elif not group in h5_file:
                 # Create the group if it doesn't exist
                 h5_file.create_group(group) 
-            if name in h5_file[group].attrs.keys() and not overwrite:
+            if name in h5_file[group].attrs and not overwrite:
                 raise Exception('Attribute %s exists in group %s. ' \
                                 'Use overwrite=True to overwrite.' % (name, group))                   
             h5_file[group].attrs[name] = value
@@ -269,7 +269,7 @@ def get_all_image_labels(self):
         images_list = {}
         with h5py.File(self.h5_path) as h5_file:
             for orientation in h5_file['/images'].keys():
-                images_list[orientation] = h5_file['/images'][orientation].keys()                
+                images_list[orientation] = list(h5_file['/images'][orientation].keys())               
         return images_list                
 
     def get_image_attributes(self, orientation):
@@ -352,7 +352,7 @@ def append_units(name, obj):
     def globals_groups(self):
         with h5py.File(self.h5_path) as h5_file:
             try:
-                return h5_file['globals'].keys()
+                return list(h5_file['globals'].keys())
             except KeyError:
                 return []   
 

__main__.py

@@ -30,7 +30,7 @@
 except ImportError:
     raise ImportError('Require labscript_utils > 2.1.0')
 
-check_version('qtutils', '2.0.0', '3.0.0')
+check_version('qtutils', '2.1.0', '3.0.0')
 
 import zprocess.locking
 from zprocess import ZMQServer
@@ -190,8 +190,10 @@ def handler(self, request_data):
         elif isinstance(request_data, dict):
             if 'filepath' in request_data:
                 h5_filepath = shared_drive.path_to_local(request_data['filepath'])
-                if not (isinstance(h5_filepath, unicode) or isinstance(h5_filepath, str)):
-                    raise AssertionError(str(type(h5_filepath)) + ' is not str or unicode')
+                if isinstance(h5_filepath, bytes):
+                    h5_filepath = h5_filepath.decode('utf8')
+                if not isinstance(h5_filepath, str):
+                    raise AssertionError(str(type(h5_filepath)) + ' is not str or bytes')
                 app.filebox.incoming_queue.put(h5_filepath)
                 return 'added successfully'
         return ("error: operation not supported. Recognised requests are:\n "
@@ -2016,10 +2018,14 @@ def get_save_data(self):
         save_data = {}
 
         box = self.singleshot_routinebox
-        save_data['SingleShot'] = zip([routine.filepath for routine in box.routines], [box.model.item(row, box.COL_ACTIVE).checkState()  for row in range(box.model.rowCount())])
+        save_data['SingleShot'] = list(zip([routine.filepath for routine in box.routines],
+                                           [box.model.item(row, box.COL_ACTIVE).checkState() 
+                                            for row in range(box.model.rowCount())]))
         save_data['LastSingleShotFolder'] = box.last_opened_routine_folder
         box = self.multishot_routinebox
-        save_data['MultiShot'] = zip([routine.filepath for routine in box.routines], [box.model.item(row, box.COL_ACTIVE).checkState()  for row in range(box.model.rowCount())])
+        save_data['MultiShot'] = list(zip([routine.filepath for routine in box.routines],
+                                          [box.model.item(row, box.COL_ACTIVE).checkState() 
+                                           for row in range(box.model.rowCount())]))
         save_data['LastMultiShotFolder'] = box.last_opened_routine_folder
 
         save_data['LastFileBoxFolder'] = self.filebox.last_opened_shots_folder

dataframe_utilities.py

@@ -22,6 +22,7 @@
 from numpy import *
 import tzlocal
 import labscript_utils.shared_drive
+from labscript_utils.dict_diff import dict_diff
 
 import runmanager
 
@@ -157,7 +158,7 @@ def flat_dict_to_flat_series(dictionary):
             result[key] = dictionary[key]
         else:
             result[key[0]] = dictionary[key]
-    keys = result.keys()
+    keys = list(result.keys())
     keys.sort(key = lambda item: 
         (len(item),) + item if isinstance(item, tuple) else (1,item))
     return pandas.Series(result,index=keys)  
@@ -220,31 +221,5 @@ def replace_with_padding(df, row, index):
     df = df.sort_index()
     return df
 
-def dict_diff(dict1, dict2):
-    """Return the difference between two dictionaries as a dictionary of key: [val1, val2] pairs.
-    Keys unique to either dictionary are included as key: [val1, '-'] or key: ['-', val2]."""
-    diff_keys = []
-    common_keys = intersect1d(dict1.keys(), dict2.keys())
-    for key in common_keys:
-        if iterable(dict1[key]):
-            if any(dict1[key] != dict2[key]):
-                diff_keys.append(key)
-        else:
-            if dict1[key] != dict2[key]:
-                diff_keys.append(key)
-
-    dict1_unique = [key for key in dict1.keys() if key not in common_keys]    
-    dict2_unique = [key for key in dict2.keys() if key not in common_keys]
-                
-    diff = {}
-    for key in diff_keys:
-        diff[key] = [dict1[key], dict2[key]]
-    
-    for key in dict1_unique:
-        diff[key] = [dict1[key], '-']
-        
-    for key in dict2_unique:
-        diff[key] = ['-', dict2[key]]       
 
-    return diff