Commit62ecd6c

committed

Fix trailing newline handling and typo on test code.

1 parent8065d2a commit62ecd6cCopy full SHA for 62ecd6c

File tree

-6

lines changed

-6

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -403,7 +403,7 @@ def _serialize(self, stream):`
`403`	`403`
`404`	`404`	`ifself.gpgsig:`
`405`	`405`	`write("gpgsig")`
`406`		`-forsiglineinself.gpgsig.split("\n"):`
	`406`	`+forsiglineinself.gpgsig.rstrip("\n").split("\n"):`
`407`	`407`	`write(" "+sigline+"\n")`
`408`	`408`
`409`	`409`	`write("\n")`
`@@ -458,7 +458,7 @@ def _deserialize(self, stream):`
`458`	`458`	`is_next_header=True`
`459`	`459`	`break`
`460`	`460`	`sig+=sigbuf[1:]`
`461`		`-self.gpgsig=sig`
	`461`	`+self.gpgsig=sig.rstrip("\n")`
`462`	`462`	`ifis_next_header:`
`463`	`463`	`continue`
`464`	`464`	`buf=readline().strip()`

Lines changed: 3 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -298,12 +298,11 @@ def test_gpgsig(self):`
`298`	`298`	`BX/otlTa8pNE3fWYBxURvfHnMY4i3HQT7Bc1QjImAhMnyo2vJk4ORBJIZ1FTNIhJ`
`299`	`299`	`JzJMZDRLQLFvnzqZuCjE`
`300`	`300`	`=przd`
`301`		`------END PGP SIGNATURE-----`
`302`		`-"""`
	`301`	`+-----END PGP SIGNATURE-----"""`
`303`	`302`	`assertcmt.gpgsig==fixture_sig`
`304`	`303`
`305`	`304`	`cmt.gpgsig="<test\ndummy\nsig>"`
`306`		`-assertcmt.gpgsig!=sig`
	`305`	`+assertcmt.gpgsig!=fixture_sig`
`307`	`306`
`308`	`307`	`cstream=StringIO()`
`309`	`308`	`cmt._serialize(cstream)`
`@@ -312,7 +311,7 @@ def test_gpgsig(self):`
`312`	`311`	`cstream.seek(0)`
`313`	`312`	`cmt.gpgsig=None`
`314`	`313`	`cmt._deserialize(cstream)`
`315`		`-assertcmt.gpgsig=="<test\ndummy\nsig>\n"`
	`314`	`+assertcmt.gpgsig=="<test\ndummy\nsig>"`
`316`	`315`
`317`	`316`	`cmt.gpgsig=None`
`318`	`317`	`cstream=StringIO()`

Comments

(0)