From c70a220016862b68492b4d0e33f2837d869e19e3 Mon Sep 17 00:00:00 2001 From: Jean-Paul Chaput Date: Thu, 10 Nov 2016 10:34:34 +0100 Subject: [PATCH] Correct some old style Hurricane/Python constants in Stratus. --- stratus1/src/stratus/st_instance.py | 2 +- stratus1/src/stratus/st_model.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/stratus1/src/stratus/st_instance.py b/stratus1/src/stratus/st_instance.py index 983f862b..366d1e0a 100644 --- a/stratus1/src/stratus/st_instance.py +++ b/stratus1/src/stratus/st_instance.py @@ -345,7 +345,7 @@ class Inst : # Not for vdd/vss in case of utilisation of SetGlobal # The detection is done with vst driver in this case ... for plug in self._hur_instance.getUnconnectedPlugs(): - if plug.getMasterNet().getType() not in ( TypePOWER, TypeGROUND ) : + if plug.getMasterNet().getType() not in ( Net.Type.POWER, Net.Type.GROUND ) : name = str(plug.getMasterNet().getName()) chaine = re.search ( "(.*)\(", name ) if chaine : name = chaine.group(1) diff --git a/stratus1/src/stratus/st_model.py b/stratus1/src/stratus/st_model.py index f4fc20de..32476d82 100644 --- a/stratus1/src/stratus/st_model.py +++ b/stratus1/src/stratus/st_model.py @@ -274,7 +274,7 @@ class Model : direction = net.getDirection() name = str(net.getName()) - if net.getType() in ( TypePOWER, TypeGROUND, TypeCLOCK ) : + if net.getType() in ( Net.Type.POWER, Net.Type.GROUND, Net.Type.CLOCK ) : found = True continue @@ -1199,7 +1199,7 @@ class Model : if plug_de_inst.getMasterNet().getDirection() == DirectionIN : # ignore vdd and vss type = plug_de_inst.getNet().getType() - if type not in ( TypePOWER, TypeGROUND ) : net_entree_inst.append ( plug_de_inst.getNet() ) + if type not in ( Net.Type.POWER, Net.Type.GROUND ) : net_entree_inst.append ( plug_de_inst.getNet() ) ### Deletion of te instance ### # If the instance has only one output