Commitbab1d8e

committed

os_ops::readlines is updated (revision)

1 parentcc4361c commitbab1d8eCopy full SHA for bab1d8e

File tree

+38

-5

lines changed

+38

-5

lines changed

Lines changed: 15 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -352,12 +352,26 @@ def readlines(self, filename, num_lines=0, binary=False, encoding=None):`
`352`	`352`	`Read lines from a local file.`
`353`	`353`	`If num_lines is greater than 0, only the last num_lines lines will be read.`
`354`	`354`	`"""`
	`355`	`+asserttype(num_lines)==int# noqa: E721`
	`356`	`+asserttype(filename)==str# noqa: E721`
	`357`	`+asserttype(binary)==bool# noqa: E721`
	`358`	`+assertencodingisNoneortype(encoding)==str# noqa: E721`
`355`	`359`	`assertnum_lines>=0`
	`360`	`+`
	`361`	`+ifbinary:`
	`362`	`+assertencodingisNone`
	`363`	`+pass`
	`364`	`+elifencodingisNone:`
	`365`	`+encoding=get_default_encoding()`
	`366`	`+asserttype(encoding)==str# noqa: E721`
	`367`	`+else:`
	`368`	`+asserttype(encoding)==str# noqa: E721`
	`369`	`+pass`
	`370`	`+`
`356`	`371`	`mode='rb'ifbinaryelse'r'`
`357`	`372`	`ifnum_lines==0:`
`358`	`373`	`withopen(filename,mode,encoding=encoding)asfile:# open in binary mode`
`359`	`374`	`returnfile.readlines()`
`360`		`-`
`361`	`375`	`else:`
`362`	`376`	`bufsize=8192`
`363`	`377`	`buffers=1`

Lines changed: 23 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -484,18 +484,37 @@ def _read__binary(self, filename):`
`484`	`484`	`returncontent`
`485`	`485`
`486`	`486`	`defreadlines(self,filename,num_lines=0,binary=False,encoding=None):`
	`487`	`+asserttype(num_lines)==int# noqa: E721`
	`488`	`+asserttype(filename)==str# noqa: E721`
	`489`	`+asserttype(binary)==bool# noqa: E721`
	`490`	`+assertencodingisNoneortype(encoding)==str# noqa: E721`
	`491`	`+`
`487`	`492`	`ifnum_lines>0:`
`488`		`-cmd="tail -n {} {}".format(num_lines,filename)`
	`493`	`+cmd= ["tail","-n",str(num_lines),filename]`
	`494`	`+else:`
	`495`	`+cmd= ["cat",filename]`
	`496`	`+`
	`497`	`+ifbinary:`
	`498`	`+assertencodingisNone`
	`499`	`+pass`
	`500`	`+elifencodingisNone:`
	`501`	`+encoding=get_default_encoding()`
	`502`	`+asserttype(encoding)==str# noqa: E721`
`489`	`503`	`else:`
`490`		`-cmd="cat {}".format(filename)`
	`504`	`+asserttype(encoding)==str# noqa: E721`
	`505`	`+pass`
`491`	`506`
`492`	`507`	`result=self.exec_command(cmd,encoding=encoding)`
	`508`	`+assertresultisnotNone`
`493`	`509`
`494`		`-ifnotbinaryandresult:`
`495`		`-lines=result.decode(encodingorget_default_encoding()).splitlines()`
	`510`	`+ifbinary:`
	`511`	`+asserttype(result)==bytes# noqa: E721`
	`512`	`+lines=result.splitlines()`
`496`	`513`	`else:`
	`514`	`+asserttype(result)==str# noqa: E721`
`497`	`515`	`lines=result.splitlines()`
`498`	`516`
	`517`	`+asserttype(lines)==list# noqa: E721`
`499`	`518`	`returnlines`
`500`	`519`
`501`	`520`	`defread_binary(self,filename,offset):`

Comments

(0)