Skip to content

Commit 736d4ad

Browse files
PMeiraPMeira
committed
Obj: allow setting object references to None to clear the reference.
1 parent d24bda1 commit 736d4ad

31 files changed

+94
-92
lines changed

‎altdss/CapControl.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ def _get_Element(self) -> DSSObj:
6666
return self._get_obj(1, None)
6767

6868
def _set_Element(self, value: Union[AnyStr, DSSObj], flags: enums.SetterFlags = 0):
69-
if isinstance(value, DSSObj):
69+
if isinstance(value, DSSObj) or value is None:
7070
self._set_obj(1, value, flags)
7171
return
7272

@@ -111,7 +111,7 @@ def _get_Capacitor(self) -> CapacitorObj:
111111
return self._get_obj(3, CapacitorObj)
112112

113113
def _set_Capacitor(self, value: Union[AnyStr, CapacitorObj], flags: enums.SetterFlags = 0):
114-
if isinstance(value, DSSObj):
114+
if isinstance(value, DSSObj) or value is None:
115115
self._set_obj(3, value, flags)
116116
return
117117

@@ -450,7 +450,7 @@ def _get_ControlSignal(self) -> LoadShape:
450450
return self._get_obj(23, LoadShape)
451451

452452
def _set_ControlSignal(self, value: Union[AnyStr, LoadShape], flags: enums.SetterFlags = 0):
453-
if isinstance(value, DSSObj):
453+
if isinstance(value, DSSObj) or value is None:
454454
self._set_obj(23, value, flags)
455455
return
456456

‎altdss/ESPVLControl.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ def _get_Element(self) -> DSSObj:
5252
return self._get_obj(1, None)
5353

5454
def _set_Element(self, value: Union[AnyStr, DSSObj], flags: enums.SetterFlags = 0):
55-
if isinstance(value, DSSObj):
55+
if isinstance(value, DSSObj) or value is None:
5656
self._set_obj(1, value, flags)
5757
return
5858

‎altdss/EnergyMeter.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ def _get_Element(self) -> DSSObj:
7070
return self._get_obj(1, None)
7171

7272
def _set_Element(self, value: Union[AnyStr, DSSObj], flags: enums.SetterFlags = 0):
73-
if isinstance(value, DSSObj):
73+
if isinstance(value, DSSObj) or value is None:
7474
self._set_obj(1, value, flags)
7575
return
7676

‎altdss/Fuse.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ def _get_MonitoredObj(self) -> DSSObj:
5252
return self._get_obj(1, None)
5353

5454
def _set_MonitoredObj(self, value: Union[AnyStr, DSSObj], flags: enums.SetterFlags = 0):
55-
if isinstance(value, DSSObj):
55+
if isinstance(value, DSSObj) or value is None:
5656
self._set_obj(1, value, flags)
5757
return
5858

@@ -95,7 +95,7 @@ def _get_SwitchedObj(self) -> DSSObj:
9595
return self._get_obj(3, None)
9696

9797
def _set_SwitchedObj(self, value: Union[AnyStr, DSSObj], flags: enums.SetterFlags = 0):
98-
if isinstance(value, DSSObj):
98+
if isinstance(value, DSSObj) or value is None:
9999
self._set_obj(3, value, flags)
100100
return
101101

@@ -138,7 +138,7 @@ def _get_FuseCurve(self) -> TCC_Curve:
138138
return self._get_obj(5, TCC_Curve)
139139

140140
def _set_FuseCurve(self, value: Union[AnyStr, TCC_Curve], flags: enums.SetterFlags = 0):
141-
if isinstance(value, DSSObj):
141+
if isinstance(value, DSSObj) or value is None:
142142
self._set_obj(5, value, flags)
143143
return
144144

‎altdss/GICLine.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ def _get_Spectrum(self) -> SpectrumObj:
268268
return self._get_obj(16, SpectrumObj)
269269

270270
def _set_Spectrum(self, value: Union[AnyStr, SpectrumObj], flags: enums.SetterFlags = 0):
271-
if isinstance(value, DSSObj):
271+
if isinstance(value, DSSObj) or value is None:
272272
self._set_obj(16, value, flags)
273273
return
274274

‎altdss/GICTransformer.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ def _get_VarCurve(self) -> XYcurve:
227227
return self._get_obj(12, XYcurve)
228228

229229
def _set_VarCurve(self, value: Union[AnyStr, XYcurve], flags: enums.SetterFlags = 0):
230-
if isinstance(value, DSSObj):
230+
if isinstance(value, DSSObj) or value is None:
231231
self._set_obj(12, value, flags)
232232
return
233233

‎altdss/GICsource.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ def _get_Spectrum(self) -> SpectrumObj:
192192
return self._get_obj(11, SpectrumObj)
193193

194194
def _set_Spectrum(self, value: Union[AnyStr, SpectrumObj], flags: enums.SetterFlags = 0):
195-
if isinstance(value, DSSObj):
195+
if isinstance(value, DSSObj) or value is None:
196196
self._set_obj(11, value, flags)
197197
return
198198

‎altdss/GenDispatcher.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ def _get_Element(self) -> DSSObj:
4747
return self._get_obj(1, None)
4848

4949
def _set_Element(self, value: Union[AnyStr, DSSObj], flags: enums.SetterFlags = 0):
50-
if isinstance(value, DSSObj):
50+
if isinstance(value, DSSObj) or value is None:
5151
self._set_obj(1, value, flags)
5252
return
5353

‎altdss/Generator.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ def _get_Yearly(self) -> LoadShape:
224224
return self._get_obj(10, LoadShape)
225225

226226
def _set_Yearly(self, value: Union[AnyStr, LoadShape], flags: enums.SetterFlags = 0):
227-
if isinstance(value, DSSObj):
227+
if isinstance(value, DSSObj) or value is None:
228228
self._set_obj(10, value, flags)
229229
return
230230

@@ -254,7 +254,7 @@ def _get_Daily(self) -> LoadShape:
254254
return self._get_obj(11, LoadShape)
255255

256256
def _set_Daily(self, value: Union[AnyStr, LoadShape], flags: enums.SetterFlags = 0):
257-
if isinstance(value, DSSObj):
257+
if isinstance(value, DSSObj) or value is None:
258258
self._set_obj(11, value, flags)
259259
return
260260

@@ -284,7 +284,7 @@ def _get_Duty(self) -> LoadShape:
284284
return self._get_obj(12, LoadShape)
285285

286286
def _set_Duty(self, value: Union[AnyStr, LoadShape], flags: enums.SetterFlags = 0):
287-
if isinstance(value, DSSObj):
287+
if isinstance(value, DSSObj) or value is None:
288288
self._set_obj(12, value, flags)
289289
return
290290

@@ -736,7 +736,7 @@ def _get_DynamicEq(self) -> DynamicExp:
736736
return self._get_obj(43, DynamicExp)
737737

738738
def _set_DynamicEq(self, value: Union[AnyStr, DynamicExp], flags: enums.SetterFlags = 0):
739-
if isinstance(value, DSSObj):
739+
if isinstance(value, DSSObj) or value is None:
740740
self._set_obj(43, value, flags)
741741
return
742742

@@ -786,7 +786,7 @@ def _get_Spectrum(self) -> SpectrumObj:
786786
return self._get_obj(45, SpectrumObj)
787787

788788
def _set_Spectrum(self, value: Union[AnyStr, SpectrumObj], flags: enums.SetterFlags = 0):
789-
if isinstance(value, DSSObj):
789+
if isinstance(value, DSSObj) or value is None:
790790
self._set_obj(45, value, flags)
791791
return
792792

‎altdss/IndMach012.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ def _get_Yearly(self) -> LoadShape:
321321
return self._get_obj(18, LoadShape)
322322

323323
def _set_Yearly(self, value: Union[AnyStr, LoadShape], flags: enums.SetterFlags = 0):
324-
if isinstance(value, DSSObj):
324+
if isinstance(value, DSSObj) or value is None:
325325
self._set_obj(18, value, flags)
326326
return
327327

@@ -351,7 +351,7 @@ def _get_Daily(self) -> LoadShape:
351351
return self._get_obj(19, LoadShape)
352352

353353
def _set_Daily(self, value: Union[AnyStr, LoadShape], flags: enums.SetterFlags = 0):
354-
if isinstance(value, DSSObj):
354+
if isinstance(value, DSSObj) or value is None:
355355
self._set_obj(19, value, flags)
356356
return
357357

@@ -381,7 +381,7 @@ def _get_Duty(self) -> LoadShape:
381381
return self._get_obj(20, LoadShape)
382382

383383
def _set_Duty(self, value: Union[AnyStr, LoadShape], flags: enums.SetterFlags = 0):
384-
if isinstance(value, DSSObj):
384+
if isinstance(value, DSSObj) or value is None:
385385
self._set_obj(20, value, flags)
386386
return
387387

@@ -424,7 +424,7 @@ def _get_Spectrum(self) -> SpectrumObj:
424424
return self._get_obj(22, SpectrumObj)
425425

426426
def _set_Spectrum(self, value: Union[AnyStr, SpectrumObj], flags: enums.SetterFlags = 0):
427-
if isinstance(value, DSSObj):
427+
if isinstance(value, DSSObj) or value is None:
428428
self._set_obj(22, value, flags)
429429
return
430430

0 commit comments

Comments
 (0)