diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/pressure.py b/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/pressure.py index daf29b6277f59c31bbab8fb9d9c622b9be4240a1..822c38b622e02a3d65ebf6e8d0fed9273c9075d3 100644 --- a/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/pressure.py +++ b/NON-APPROVED/COMMON/DEVICES/vacuum/COMMON/pressure.py @@ -3,6 +3,12 @@ from org.csstudio.display.builder.runtime.script import ScriptUtil tooltip = "N/A" +# Compatibility with 4.6.3 +try: + PVUtil.PVHasNoValueException +except: + setattr(PVUtil, 'PVHasNoValueException', Exception) + try: pvStat = PVUtil.getString(pvs[0]).upper() pvPrsStr = PVUtil.getString(pvs[2]) @@ -37,6 +43,8 @@ try: tooltip = pressure else: tooltip = pvPrsStr +except PVUtil.PVHasNoValueException: + pass except Exception as e: ScriptUtil.getLogger().severe(str(e)) diff --git a/NON-APPROVED/COMMON/DEVICES/vacuum/vpi/pressure.py b/NON-APPROVED/COMMON/DEVICES/vacuum/vpi/pressure.py index 83475c3c97b22c3a8455c0deb5978b5f623dc822..d23b4acd5d1c55a2c921d14f1c67dc6912c814bf 100644 --- a/NON-APPROVED/COMMON/DEVICES/vacuum/vpi/pressure.py +++ b/NON-APPROVED/COMMON/DEVICES/vacuum/vpi/pressure.py @@ -3,6 +3,12 @@ from org.csstudio.display.builder.runtime.script import ScriptUtil tooltip = "N/A" +# Compatibility with 4.6.3 +try: + PVUtil.PVHasNoValueException +except: + setattr(PVUtil, 'PVHasNoValueException', Exception) + try: pvStat = PVUtil.getString(pvs[0]).upper() # pvPrsStr = PVUtil.getString(pvs[2]) @@ -39,6 +45,8 @@ try: # tooltip = pressure # else: # tooltip = pvPrsStr +except PVUtil.PVHasNoValueException: + pass except Exception as e: ScriptUtil.getLogger().severe(str(e))