Style changes

Author: coretl

setup.py

@@ -68,7 +68,10 @@ def _add_file(f):
 ext = Extension(
     name='softioc._extension',
     sources = sources,
-    include_dirs=[epicscorelibs.path.include_path, devIocStats_src, devIocStats_os, devIocStats_default],
+    include_dirs=[
+        epicscorelibs.path.include_path,
+        devIocStats_src, devIocStats_os, devIocStats_default
+    ],
     dsos = ['epicscorelibs.lib.dbCore', 'epicscorelibs.lib.Com'],
     define_macros = get_config_var('CPPFLAGS'),
     extra_compile_args = get_config_var('CXXFLAGS'),
@@ -96,5 +99,5 @@ def install_for_development(self):
         "numpy>=1.18",
         "epicsdbbuilder>=1.4"
     ],
-    zip_safe = False, # setuptools_dso is not compatible with eggs!
+    zip_safe = False,  # setuptools_dso is not compatible with eggs!
 )

softioc/__main__.py

@@ -10,10 +10,12 @@ def main(args=None):
     parser = ArgumentParser()
     parser.add_argument("--version", action="version", version=__version__)
     parser.add_argument("script", help="The python script to run")
-    parser.add_argument("arg", help="Any arguments to pass to the script", nargs="*")
+    parser.add_argument(
+        "arg", help="Any arguments to pass to the script", nargs="*")
     parsed_args = parser.parse_args(args)
     # Execute as subprocess
-    subprocess.Popen([sys.executable, parsed_args.script, *parsed_args.arg]).communicate()
+    cmd = [sys.executable, parsed_args.script, *parsed_args.arg]
+    subprocess.Popen(cmd).communicate()
 
 
 if __name__ == "__main__":

softioc/alarm.py

@@ -1,29 +1,28 @@
 # Severity code definitions taken from EPICS alarm.h
-NO_ALARM        = 0
-MINOR_ALARM     = 1
-MAJOR_ALARM     = 2
-INVALID_ALARM   = 3
+NO_ALARM = 0
+MINOR_ALARM = 1
+MAJOR_ALARM = 2
+INVALID_ALARM = 3
 
 # Some alarm code definitions taken from EPICS alarm.h
-READ_ALARM          = 1
-WRITE_ALARM         = 2
-HIHI_ALARM          = 3
-HIGH_ALARM          = 4
-LOLO_ALARM          = 5
-LOW_ALARM           = 6
-STATE_ALARM         = 7
-COS_ALARM           = 8
-COMM_ALARM          = 9
-TIMEOUT_ALARM       = 10
-HW_LIMIT_ALARM      = 11
-CALC_ALARM          = 12
-SCAN_ALARM          = 13
-LINK_ALARM          = 14
-SOFT_ALARM          = 15
-BAD_SUB_ALARM       = 16
-UDF_ALARM           = 17
-DISABLE_ALARM       = 18
-SIMM_ALARM          = 19
-READ_ACCESS_ALARM   = 20
-WRITE_ACCESS_ALARM  = 21
-
+READ_ALARM = 1
+WRITE_ALARM = 2
+HIHI_ALARM = 3
+HIGH_ALARM = 4
+LOLO_ALARM = 5
+LOW_ALARM = 6
+STATE_ALARM = 7
+COS_ALARM = 8
+COMM_ALARM = 9
+TIMEOUT_ALARM = 10
+HW_LIMIT_ALARM = 11
+CALC_ALARM = 12
+SCAN_ALARM = 13
+LINK_ALARM = 14
+SOFT_ALARM = 15
+BAD_SUB_ALARM = 16
+UDF_ALARM = 17
+DISABLE_ALARM = 18
+SIMM_ALARM = 19
+READ_ACCESS_ALARM = 20
+WRITE_ACCESS_ALARM = 21

softioc/builder.py

@@ -6,7 +6,8 @@
 
 from epicsdbbuilder import *
 from epicscorelibs import path
-from epicscorelibs.ioc import iocshRegisterCommon, registerRecordDeviceDriver, pdbbase
+from epicscorelibs.ioc import \
+    iocshRegisterCommon, registerRecordDeviceDriver, pdbbase
 
 iocshRegisterCommon()
 dbLoadDatabase("base.dbd", os.path.join(path.base_path, "dbd"))
@@ -18,7 +19,7 @@
 InitialiseDbd()
 LoadDbdFile(os.path.join(os.path.dirname(__file__), 'device.dbd'))
 
-from . import pythonSoftIoc
+from . import pythonSoftIoc  # noqa
 PythonDevice = pythonSoftIoc.PythonDevice()
 
 
@@ -40,34 +41,33 @@ def _in_record(record, name, **fields):
 
 
 def aIn(name, LOPR=None, HOPR=None, **fields):
-    return _in_record('ai', name,
-        LOPR = LOPR,    HOPR = HOPR, **fields)
+    return _in_record(
+        'ai', name, LOPR = LOPR, HOPR = HOPR, **fields)
 
 def aOut(name, LOPR=None, HOPR=None, **fields):
     fields.setdefault('DRVL', LOPR)
     fields.setdefault('DRVH', HOPR)
-    return PythonDevice.ao(name,
-        LOPR = LOPR,    HOPR = HOPR, **fields)
+    return PythonDevice.ao(
+        name, LOPR = LOPR, HOPR = HOPR, **fields)
 
 
 def boolIn(name, ZNAM=None, ONAM=None, **fields):
     return _in_record('bi', name, ZNAM = ZNAM, ONAM = ONAM, **fields)
 
 def boolOut(name, ZNAM=None, ONAM=None, **fields):
-    return PythonDevice.bo(name,
-        OMSL = 'supervisory',
-        ZNAM = ZNAM, ONAM = ONAM, **fields)
+    return PythonDevice.bo(
+        name, OMSL = 'supervisory', ZNAM = ZNAM, ONAM = ONAM, **fields)
 
 
 def longIn(name, LOPR=None, HOPR=None, EGU=None, **fields):
     fields.setdefault('MDEL', -1)
-    return _in_record('longin', name,
-        EGU  = EGU, LOPR = LOPR,  HOPR = HOPR, **fields)
+    return _in_record(
+        'longin', name, EGU = EGU, LOPR = LOPR, HOPR = HOPR, **fields)
 
 def longOut(name, DRVL=None, DRVH=None, EGU=None, **fields):
-    return PythonDevice.longout(name,
-        OMSL = 'supervisory',
-        DRVL = DRVL, DRVH = DRVH, EGU = EGU, **fields)
+    return PythonDevice.longout(
+        name, OMSL = 'supervisory', DRVL = DRVL, DRVH = DRVH, EGU = EGU,
+        **fields)
 
 
 # Field name prefixes for mbbi/mbbo records.

softioc/device.py

@@ -96,7 +96,7 @@ def __init__(self, name, **kargs):
         else:
             self.__on_update = None
 
-        self.__validate  = kargs.pop('validate', None)
+        self.__validate = kargs.pop('validate', None)
         self.__always_update = kargs.pop('always_update', False)
         self._value = kargs.pop('initial_value', None)
         self.__enable_write = True
@@ -213,32 +213,36 @@ def get(self):
 def _Device(Base, record_type, rval=False, mlst=False, default=0):
     '''Wrapper for generating simple records.'''
     val_field = 'RVAL' if rval else 'VAL'
+
     class GenericDevice(Base):
         _record_type_ = record_type
         _device_name_ = 'devPython_' + record_type
-        _val_field_   = val_field
-        _default_     = default
-        _fields_      = ['UDF', val_field]
-        if mlst: _fields_.append('MLST')
+        _val_field_ = val_field
+        _default_ = default
+        _fields_ = ['UDF', val_field]
+        if mlst:
+            _fields_.append('MLST')
 
     GenericDevice.__name__ = record_type
     return GenericDevice
 
-_In  = ProcessDeviceSupportIn
+_In = ProcessDeviceSupportIn
 _Out = ProcessDeviceSupportOut
-def _Device_In (type, **kargs):
+
+def _Device_In(type, **kargs):
     return _Device(_In,  type, **kargs)
+
 def _Device_Out(type, rval=False, mlst=True):
     return _Device(_Out, type, rval=rval, mlst=mlst, default=None)
 
-longin      = _Device_In ('longin')
-longout     = _Device_Out('longout')
-bi          = _Device_In ('bi', rval=True)
-bo          = _Device_Out('bo', rval=True)
-stringin    = _Device_In ('stringin', mlst=False, default='')
-stringout   = _Device_Out('stringout', mlst=False)
-mbbi        = _Device_In ('mbbi', rval=True)
-mbbo        = _Device_Out('mbbo', rval=True)
+longin = _Device_In('longin')
+longout = _Device_Out('longout')
+bi = _Device_In('bi', rval=True)
+bo = _Device_Out('bo', rval=True)
+stringin = _Device_In('stringin', mlst=False, default='')
+stringout = _Device_Out('stringout', mlst=False)
+mbbi = _Device_In('mbbi', rval=True)
+mbbo = _Device_Out('mbbo', rval=True)
 
 
 NO_CONVERT = 2
@@ -254,10 +258,10 @@ def _Device_Out(type, rval=False, mlst=True):
 class ai(ProcessDeviceSupportIn):
     _record_type_ = 'ai'
     _device_name_ = 'devPython_ai'
-    _val_field_   = 'VAL'
-    _default_     = 0.0
-    _fields_      = ['UDF', 'VAL']
-    _dset_extra_  = dset_process_linconv
+    _val_field_ = 'VAL'
+    _default_ = 0.0
+    _fields_ = ['UDF', 'VAL']
+    _dset_extra_ = dset_process_linconv
 
     def _process(self, record):
         _value = self._value
@@ -271,9 +275,9 @@ def _process(self, record):
 class ao(ProcessDeviceSupportOut):
     _record_type_ = 'ao'
     _device_name_ = 'devPython_ao'
-    _val_field_   = 'VAL'
-    _fields_      = ['UDF', 'VAL', 'MLST']
-    _dset_extra_  = dset_process_linconv
+    _val_field_ = 'VAL'
+    _fields_ = ['UDF', 'VAL', 'MLST']
+    _dset_extra_ = dset_process_linconv
 
     def init_record(self, record):
         self.__super.init_record(record)
@@ -304,12 +308,14 @@ def _read_value(self, record):
 
     def _write_value(self, record, value):
         value = numpy.require(value, dtype = self.dtype)
-        if value.shape == ():  value.shape = (1,)
+        if value.shape == ():
+            value.shape = (1,)
         assert value.ndim == 1, 'Can\'t write multidimensional arrays'
 
         nelm = record.NELM
         nord = len(value)
-        if nord > nelm:  nord = nelm
+        if nord > nelm:
+            nord = nelm
         memmove(
             record.BPTR, value.ctypes.data_as(c_void_p),
             self.dtype.itemsize * nord)
@@ -319,7 +325,7 @@ def _write_value(self, record, value):
 class waveform(WaveformBase, ProcessDeviceSupportIn):
     _record_type_ = 'waveform'
     _device_name_ = 'devPython_waveform'
-    _default_     = ()
+    _default_ = ()
 
     # Because arrays are mutable values it's ever so easy to accidentially call
     # set() with a value which subsequently changes.  To avoid this common class
@@ -338,7 +344,8 @@ def set(self, value,
 
         value = numpy.require(value, dtype = self.dtype)
         self._value = (+value, severity, alarm, timestamp)
-        if value.shape == ():  value.shape = (1,)
+        if value.shape == ():
+            value.shape = (1,)
         assert value.ndim == 1, 'Can\'t write multidimensional arrays'
 
         self.trigger()

softioc/device_core.py

@@ -28,7 +28,8 @@ def __init__(cls, name, bases, dict):
         # Binds cls.__super_cls().method to the appropriate superclass
         # class method.  Unfortunately the .__super form doesn't work
         # with class methods, only instance methods.
-        setattr(cls, '_%s__super_cls' % name,
+        setattr(
+            cls, '_%s__super_cls' % name,
             classmethod(lambda child: super(cls, child)))
         # Finally call the class initialisatio nmethod.
         cls.__init_class__()
@@ -104,7 +105,7 @@ def __init_class__(cls):
         # Now construct the device support table.  We build on the common
         # base and add any device specific definitions here.
         class DSET(DSET_BASE):
-            _fields_         = cls._dset_extra_[0]
+            _fields_ = cls._dset_extra_[0]
             _record_offsets_ = cls._dset_extra_[1]
         dset = DSET(
             number = len(DSET_BASE._fields_) + len(DSET._fields_) - 1)

softioc/extension.c

@@ -19,7 +19,8 @@
 #endif
 
 /* Reference stealing version of PyDict_SetItemString */
-static void set_dict_item_steal(PyObject *dict, const char *name, PyObject *py_value)
+static void set_dict_item_steal(
+    PyObject *dict, const char *name, PyObject *py_value)
 {
     PyDict_SetItemString(dict, name, py_value);
     Py_DECREF(py_value);
@@ -57,25 +58,23 @@ static PyObject *get_DBF_values(PyObject *self, PyObject *args)
 
 /* Given an array of field names, this routine looks up each field name in
  * the EPICS database and returns the corresponding field offset. */
-
 static PyObject *get_field_offsets(PyObject *self, PyObject *args)
 {
-    int status;
     const char *record_type;
-    PyObject *dict = PyDict_New();
-
     if (!PyArg_ParseTuple(args, "s", &record_type))
         return NULL;
 
     DBENTRY dbentry;
     dbInitEntry(pdbbase, &dbentry);
 
-    status = dbFindRecordType(&dbentry, record_type);
+    int status = dbFindRecordType(&dbentry, record_type);
     if (status != 0)
         printf("Unable to find record type \"%s\" (error %d)\n",
             record_type, status);
     else
         status = dbFirstField(&dbentry, 0);
+
+    PyObject *dict = PyDict_New();
     while (status == 0)
     {
         const char * field_name = dbGetFieldName(&dbentry);
@@ -106,9 +105,11 @@ static PyObject *db_put_field(PyObject *self, PyObject *args)
 
     struct dbAddr dbAddr;
     if (dbNameToAddr(name, &dbAddr))
-        return PyErr_Format(PyExc_RuntimeError, "dbNameToAddr failed for %s", name);
+        return PyErr_Format(
+            PyExc_RuntimeError, "dbNameToAddr failed for %s", name);
     if (dbPutField(&dbAddr, dbrType, pbuffer, length))
-        return PyErr_Format(PyExc_RuntimeError, "dbPutField failed for %s", name);
+        return PyErr_Format(
+            PyExc_RuntimeError, "dbPutField failed for %s", name);
     Py_RETURN_NONE;
 }
 
@@ -200,6 +201,7 @@ void EpicsPvPutHook(struct asTrapWriteMessage *pmessage, int after)
         pmessage->userPvt = value;
 }
 
+
 static PyObject *install_pv_logging(PyObject *self, PyObject *args)
 {
     const char *acf_file;