Skip to content

Commit 7257e45

Browse files
PostgresConfigurationFactory_Base is corrected (#25)
- Helper__CreateObject uses compares types via "is" - fix: Helper__CreateFileLine returns PostgresConfigurationFileLine_Base - fix: Helper__CreateOption returns PostgresConfigurationOption_Base - del: Helper__CreateFileLineComment
1 parent de43404 commit 7257e45

1 file changed

Lines changed: 7 additions & 23 deletions

File tree

src/implementation/v00/configuration_base.py

Lines changed: 7 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3096,23 +3096,20 @@ def Helper__CreateObject(
30963096
objectParent, PostgresConfigurationObject
30973097
)
30983098

3099-
typeOfObjectData = type(objectData)
3100-
assert typeOfObjectData is not None
3101-
3102-
if typeOfObjectData == PgCfgModel__ConfigurationData:
3099+
if type(objectData) is PgCfgModel__ConfigurationData:
31033100
assert objectData is cfg.m_Data
31043101
return cfg
31053102

3106-
if typeOfObjectData == PgCfgModel__FileData:
3103+
if type(objectData) is PgCfgModel__FileData:
31073104
return __class__.Helper__CreateFile(objectData, objectParent)
31083105

3109-
if typeOfObjectData == PgCfgModel__FileLineData:
3106+
if type(objectData) is PgCfgModel__FileLineData:
31103107
return __class__.Helper__CreateFileLine(objectData, objectParent)
31113108

3112-
if typeOfObjectData == PgCfgModel__OptionData:
3109+
if type(objectData) is PgCfgModel__OptionData:
31133110
return __class__.Helper__CreateOption(objectData, objectParent)
31143111

3115-
BugCheckError.UnkObjectDataType(typeOfObjectData)
3112+
BugCheckError.UnkObjectDataType(type(objectData))
31163113

31173114
# --------------------------------------------------------------------
31183115
@staticmethod
@@ -3137,33 +3134,20 @@ def Helper__CreateFile(
31373134
def Helper__CreateFileLine(
31383135
objectData: PgCfgModel__FileLineData,
31393136
objectParent: PostgresConfigurationObject,
3140-
) -> PostgresConfigurationFile_Base:
3137+
) -> PostgresConfigurationFileLine_Base:
31413138
assert objectData is not None
31423139
assert objectParent is not None
31433140
assert type(objectData) is PgCfgModel__FileLineData
31443141
assert isinstance(objectParent, PostgresConfigurationFile_Base)
31453142

31463143
return PostgresConfigurationFileLine_Base(objectParent, objectData)
31473144

3148-
# --------------------------------------------------------------------
3149-
@staticmethod
3150-
def Helper__CreateFileLineComment(
3151-
fileLineDataItem: PgCfgModel__FileLineData.tagItem,
3152-
fileLine: PostgresConfigurationObject,
3153-
) -> PostgresConfigurationFile_Base:
3154-
assert fileLineDataItem is not None
3155-
assert fileLine is not None
3156-
assert type(fileLineDataItem) is PgCfgModel__FileLineData.tagItem
3157-
assert isinstance(fileLine, PostgresConfigurationFileLine_Base)
3158-
3159-
return PostgresConfigurationComment_Base(fileLine, fileLineDataItem)
3160-
31613145
# --------------------------------------------------------------------
31623146
@staticmethod
31633147
def Helper__CreateOption(
31643148
objectData: PgCfgModel__OptionData,
31653149
objectParent: PostgresConfigurationObject,
3166-
) -> PostgresConfigurationFile_Base:
3150+
) -> PostgresConfigurationOption_Base:
31673151
assert objectData is not None
31683152
assert objectParent is not None
31693153
assert type(objectData) is PgCfgModel__OptionData

0 commit comments

Comments
 (0)