Commite2dfddb

authored

ConfigurationFileReader::ReadLine returns typing.Optional[str] (#4)

It returns str or NoneNone - it is EOF.

1 parent212de33 commite2dfddbCopy full SHA for e2dfddb

File tree

+24

-6

lines changed

+24

-6

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -3308,7 +3308,7 @@ def Helper__LoadFileContent(`
`3308`	`3308`	`lineData=fileContent.ReadLine()`
`3309`	`3309`
`3310`	`3310`	`ifnotlineData:`
`3311`		`-#assert lineData is None`
	`3311`	`+assertlineDataisNone`
`3312`	`3312`	`break`
`3313`	`3313`
`3314`	`3314`	`asserttype(lineData)==str`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -6,14 +6,15 @@`
`6`	`6`	`from ...core.raise_errorimportRaiseError`
`7`	`7`
`8`	`8`	`importdatetime`
	`9`	`+importtyping`
`9`	`10`
`10`	`11`
`11`	`12`	`# //////////////////////////////////////////////////////////////////////////////`
`12`	`13`	`# class ConfigurationFileReader`
`13`	`14`
`14`	`15`
`15`	`16`	`classConfigurationFileReader:`
`16`		`-defReadLine(self)->str:`
	`17`	`+defReadLine(self)->typing.Optional[str]:`
`17`	`18`	`RaiseError.MethodIsNotImplemented(__class__,"ReadLine")`
`18`	`19`
`19`	`20`

Lines changed: 10 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`importos`
`9`	`9`	`importio`
`10`	`10`	`importdatetime`
	`11`	`+importtyping`
`11`	`12`
`12`	`13`	`# //////////////////////////////////////////////////////////////////////////////`
`13`	`14`	`# class ConfigurationOsFile`
`@@ -49,9 +50,16 @@ def IsClosed(self) -> bool:`
`49`	`50`	`returnself.m_fileisNone`
`50`	`51`
`51`	`52`	`# --------------------------------------------------------------------`
`52`		`-defReadLine(self)->str:`
	`53`	`+defReadLine(self)->typing.Optional[str]:`
`53`	`54`	`assertisinstance(self.m_file,io.TextIOWrapper)`
`54`		`-returnself.m_file.readline()`
	`55`	`+r=self.m_file.readline()`
	`56`	`+asserttype(r)==str# noqa: E721`
	`57`	`+ifnotr:`
	`58`	`+assertr==""`
	`59`	`+returnNone`
	`60`	`+`
	`61`	`+assertr!=""`
	`62`	`+returnr`
`55`	`63`
`56`	`64`	`# --------------------------------------------------------------------`
`57`	`65`	`defOverwrite(self,text:str)->None:`

Lines changed: 11 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`fromsrc.os.abstract.configuration_os_opsimportConfigurationFileReader`
`5`	`5`
`6`	`6`	`importio`
	`7`	`+importtyping`
`7`	`8`
`8`	`9`	`# //////////////////////////////////////////////////////////////////////////////`
`9`	`10`	`# class CfgFileReader`
`@@ -19,9 +20,17 @@ def __init__(self, text: str):`
`19`	`20`	`self.m_file=io.StringIO(text)`
`20`	`21`
`21`	`22`	`# --------------------------------------------------------------------`
`22`		`-defReadLine(self)->str:`
	`23`	`+defReadLine(self)->typing.Optional[str]:`
`23`	`24`	`asserttype(self.m_file)==io.StringIO`
`24`		`-returnself.m_file.readline()`
	`25`	`+`
	`26`	`+r=self.m_file.readline()`
	`27`	`+asserttype(r)==str# noqa: E721`
	`28`	`+ifnotr:`
	`29`	`+assertr==""`
	`30`	`+returnNone`
	`31`	`+`
	`32`	`+assertr!=""`
	`33`	`+returnr`
`25`	`34`
`26`	`35`
`27`	`36`	`# //////////////////////////////////////////////////////////////////////////////`

Comments

(0)