Merge branch 'typo' into 'master'

Bunch of typo in the python code

See merge request limagroup/Lima-tango-python!122

Author: claustre

Lima/Server/AttrHelper.py

@@ -54,8 +54,6 @@
 #       return get_attr_4u(self, name, _AndorCamera)
 #
 
-import six
-
 import PyTango
 
 

Lima/Server/EdfFile.py

@@ -100,13 +100,13 @@ def GetData(self,Index, DataType="",Pos=None,Size=None):
     import gzip
 
     GZIP = True
-except:
+except ImportError:
     GZIP = False
 try:
     import bz2
 
     BZ2 = True
-except:
+except ImportError:
     BZ2 = False
 
 MARCCD_SUPPORT = False
@@ -118,7 +118,7 @@ def GetData(self,Index, DataType="",Pos=None,Size=None):
     from . import TiffIO
 
     TIFF_SUPPORT = True
-except:
+except ImportError:
     TIFF_SUPPORT = False
 
 # Constants
@@ -299,7 +299,7 @@ def __init__(self, FileName, access=None, fastedf=None):
             else:
                 try:
                     self.File.close()
-                except:
+                except Exception:
                     pass
                 raise IOError("EdfFile: Error opening file")
 
@@ -429,7 +429,7 @@ def __init__(self, FileName, access=None, fastedf=None):
                         header[key.strip()] = val.strip(" ;\n")
                     line = infile.readline()
                     bytesread = bytesread + len(line)
-            except:
+            except Exception:
                 raise Exception("Error processing adsc header")
             # banned by bzip/gzip???
             try:
@@ -1045,7 +1045,7 @@ def __SetDataType__(self, Array, DataType):
     def __del__(self):
         try:
             self.__makeSureFileIsClosed()
-        except:
+        except Exception:
             pass
 
     def GetDefaultNumpyType(self, EdfType, index=None):

Lima/Server/EnvHelper.py

@@ -22,9 +22,8 @@
 ############################################################################
 
 import sys
-import time
-import types
-import os, tempfile, re
+import os
+import re
 from subprocess import Popen, PIPE
 import inspect
 import logging
@@ -105,7 +104,7 @@ def get_lima_device_name(server=None, cache=True):
                    [default: use current process args]
     :type server: str
     :param cache: use last value stored in cache
-    :type cache: bool    
+    :type cache: bool
     :return: LimaCCDs tango device name for the given server
     :rtype: str
     """
@@ -120,7 +119,7 @@ def get_lima_camera_type(server=None, cache=True):
                    [default: use current process args]
     :type server: str
     :param cache: use last value stored in cache
-    :type cache: bool    
+    :type cache: bool
     :return: the lima camera type for the given server (Ex: Basler)
     :rtype: str
     """
@@ -165,9 +164,8 @@ def setup_lima_env(argv):
     s2 = h + "from[ ]+Lima[ ]+import[ ]+" + p
     s3 = h + "from[ ]+Lima\\." + p + "(\\.([A-Za-z0-9_]+))*[ ]+import[ ]+"
     o1, o2, o3 = re.compile(s1), re.compile(s2), re.compile(s3)
-    vers = {}
-    for l in cfile.readlines():
-        m = o1.match(l) or o2.match(l) or o3.match(l)
+    for line in cfile.readlines():
+        m = o1.match(line) or o2.match(line) or o3.match(line)
         if not m:
             continue
         pname = m.group("plugin")
@@ -191,7 +189,7 @@ def check_args(argv):
         if arg.startswith("-v"):
             try:
                 Debug = max(0, int(arg[2:]) - 1)
-            except:
+            except Exception:
                 pass
     return 1
 
@@ -240,7 +238,7 @@ def setup_env(mod):
 
 def find_dep_vers(mod):
     vers = {}
-    vre_str = "v[0-9]+\.[0-9]+\.[0-9]+"
+    vre_str = r"v[0-9]+\.[0-9]+\.[0-9]+"
     vre_obj = re.compile(vre_str)
     pdir = os.path.join(check_lima_dir(), mod)
     for vdir in os.listdir(pdir):
@@ -318,7 +316,7 @@ def __filter(obj, tango_class_name, member_name, member):
     import Lima.Core
 
     # Avoid enumerations
-    is_enum = type(type(member)) == type(Lima.Core.CtControl.CameraErrorCode)
+    is_enum = type(type(member)) is type(Lima.Core.CtControl.CameraErrorCode)
     if is_enum and member_name[0].isupper():
         return False
     return True

Lima/Server/LimaCCDs.py

@@ -44,7 +44,9 @@
 # =============================================================================
 #
 
-import sys, os, glob
+import sys
+import os
+import glob
 import PyTango
 import weakref
 import itertools
@@ -125,7 +127,6 @@ def unsupported_method(*args, **kws):
                 head = "attr. %s [%s]" % (m.group("attr"), m.group("op"))
             else:
                 head = "method %s" % f.__name__
-            op = re.compile
             msg = (
                 "Error: %s cannot be called because %s is not supported "
                 "in this (detector-required) version of LIMA" % (head, feature)
@@ -202,8 +203,8 @@ class LimaCCDs(PyTango.LatestDeviceImpl):
         Core.Bpp32: "Bpp32",
         Core.Bpp32S: "Bpp32S",
     }
-    
-    String2ImageType = { v: k for k, v in ImageType2String.items() }
+
+    String2ImageType = {v: k for k, v in ImageType2String.items()}
 
     # DATA_ARRAY DevEncoded
     # enum DataArrayCategory {
@@ -434,7 +435,6 @@ def init_device(self):
         self.set_state(PyTango.DevState.ON)
         self.get_device_properties(self.get_device_class())
         self.__className2deviceName = get_sub_devices()
-        dataBase = PyTango.Database()
 
         TacoSpecificName.append(self.LimaCameraType)
 
@@ -654,11 +654,11 @@ def init_device(self):
             self.__BufferHelperEnums = {
                 "durationPolicy": {
                     "EPHEMERAL": Core.BufferHelper.Parameters.Ephemeral,
-                    "PERSISTENT": Core.BufferHelper.Parameters.Persistent, 
+                    "PERSISTENT": Core.BufferHelper.Parameters.Persistent,
                 },
                 "sizePolicy": {
                     "AUTOMATIC": Core.BufferHelper.Parameters.Automatic,
-                    "FIXED": Core.BufferHelper.Parameters.Fixed, 
+                    "FIXED": Core.BufferHelper.Parameters.Fixed,
                 },
             }
             self.__BufferParamData = {
@@ -1165,15 +1165,15 @@ def write_acc_saturated_cblevel(self, attr):
         else:
             msg = "Accumulation threshold plugins not loaded"
             deb.Error(msg)
-            
+
     ## @brief Read the output image type (after acumulation)
     #
     @Core.DEB_MEMBER_FUNCT
     def read_acc_out_type(self, attr):
         acc = self.__control.accumulation()
         imageType = acc.getOutputType()
         stringType = self.ImageType2String.get(imageType, "?")
-        
+
         attr.set_value(stringType)
 
     ## @brief Write the output image type (after acumulation)
@@ -1924,7 +1924,7 @@ def read_shared_memory_names(self, attr):
         try:
             shared_memory = self.__control.display()
             shared_memory_names = shared_memory.getNames()
-        except:
+        except Exception:
             shared_memory_names = ["", ""]
         attr.set_value(shared_memory_names)
 
@@ -1933,21 +1933,21 @@ def write_shared_memory_names(self, attr):
         try:
             shared_memory = self.__control.display()
             shared_memory.setNames(*self.__shared_memory_names)
-        except:
+        except Exception:
             pass
 
     def read_shared_memory_active(self, attr):
         try:
             shared_memory = self.__control.display().isActive()
-        except:
+        except Exception:
             shared_memory = False
         attr.set_value(shared_memory)
 
     def write_shared_memory_active(self, attr):
         data = attr.get_write_value()
         try:
             self.__control.display().setActive(data)
-        except:
+        except Exception:
             pass
 
     def read_config_available_module(self, attr):
@@ -1981,7 +1981,6 @@ def writeBufferParam(self, attr, param=None, getter=None, setter=None):
         setattr(buffer_param, param_name, val)
         setter(buffer_param)
 
-
     # ==================================================================
     #
     #    LimaCCDs command methods
@@ -2011,7 +2010,7 @@ def getAttrStringValueList(self, attr_name):
             try:
                 values = acq.getTriggerModeList()
                 valueList = [getDictKey(self.__AcqTriggerMode, val) for val in values]
-            except:
+            except Exception:
                 valueList = list(self.__AcqTriggerMode.keys())
         elif attr_name == "saving_format":
             return self.__SavingFormat
@@ -2090,7 +2089,7 @@ def setImageHeader(self, headers_str):
         for image_header in headers_str:
             imageIdSepPos = image_header.find(self.__image_number_header_delimiter)
             imageId = int(image_header[:imageIdSepPos])
-            header_str = image_header[imageIdSepPos + 1 :]
+            header_str = image_header[imageIdSepPos + 1:]
             deb.Param("Setting to image %d file header: %s" % (imageId, header_str))
             header_map = {}
             for line in header_str.split(self.__entry_header_delimiter):
@@ -2220,7 +2219,7 @@ def readImage(self, frame_number):
         category = self.DataArrayCategory.Image
         self._datacache = self._image_2_data_array(image, category)
         return ("DATA_ARRAY", self._datacache)
-        
+
     ##@brief get last image data (if new image since last_frame_number)
     #
     # @returns Image if new image available since last_frame_number else None
@@ -2230,11 +2229,11 @@ def readLastImage(self, last_frame_number=-1):
         status = self.__control.getStatus()
         last_img_ready = status.ImageCounters.LastImageReady
         if last_img_ready <= last_frame_number:
-            deb.Trace(f"No newer image available")
+            deb.Trace("No newer image available")
             PyTango.Except.throw_exception(PyTango.DevError(
                 desc="Frame(s) not available yet",
-                #tango.ErrSeverity.ERR,
-                #"readLastImage()",
+                # tango.ErrSeverity.ERR,
+                # "readLastImage()",
             ))
         else:
             image = self.__control.ReadImage(-1)
@@ -2949,7 +2948,7 @@ def export_default_plugins():
                     print("create device", specificDevice.__name__, deviceName)
                     try:
                         util.create_device(specificDevice.__name__, deviceName)
-                    except:
+                    except Exception:
                         import traceback
 
                         traceback.print_exc()
@@ -3061,8 +3060,8 @@ def _get_control():
             else:
                 specificDevice = class_info
             typeFlagsNameList = []
-            for l in range(verboseLevel + 1):
-                typeFlagsNameList += VerboseLevel2TypeFlags.get(l, [])
+            for level in range(verboseLevel + 1):
+                typeFlagsNameList += VerboseLevel2TypeFlags.get(level, [])
             Core.DebParams.setTypeFlagsNameList(typeFlagsNameList)
 
             util = PyTango.Util.instance()
@@ -3112,17 +3111,15 @@ def main(args=None, event_loop=None):
         if option.startswith("-v"):
             try:
                 verboseLevel = int(option[2:])
-            except:
+            except Exception:
                 pass
 
-    pytango_ver = PyTango.__version_info__[:3]
-
     try:
         py = PyTango.Util(args)
         py.add_TgClass(LimaCCDsClass, LimaCCDs, "LimaCCDs")
         try:
             declare_camera_n_commun_to_tango_world(py)
-        except:
+        except Exception:
             import traceback
 
             traceback.print_exc()
@@ -3141,7 +3138,7 @@ def main(args=None, event_loop=None):
 
         try:
             export_default_plugins()
-        except:
+        except Exception:
             import traceback
 
             traceback.print_exc()