Fix trailing newline handling and typo on test code.

sugi · sugi · commit 62ecd6c66a84 · 2013-10-07T18:10:45.000+09:00
diff --git a/git/objects/commit.py b/git/objects/commit.py
@@ -403,7 +403,7 @@ def _serialize(self, stream):
 
 		if self.gpgsig:
 			write("gpgsig")
-			for sigline in self.gpgsig.split("\n"):
+			for sigline in self.gpgsig.rstrip("\n").split("\n"):
 				write(" "+sigline+"\n")
 		
 		write("\n")
@@ -458,7 +458,7 @@ def _deserialize(self, stream):
 						is_next_header = True
 						break
 					sig += sigbuf[1:]
-				self.gpgsig = sig
+				self.gpgsig = sig.rstrip("\n")
 				if is_next_header:
 					continue
 			buf = readline().strip()
diff --git a/git/test/objects/test_commit.py b/git/test/objects/test_commit.py
@@ -298,12 +298,11 @@ def test_gpgsig(self):
 BX/otlTa8pNE3fWYBxURvfHnMY4i3HQT7Bc1QjImAhMnyo2vJk4ORBJIZ1FTNIhJ
 JzJMZDRLQLFvnzqZuCjE
 =przd
------END PGP SIGNATURE-----
-"""
+-----END PGP SIGNATURE-----"""
 		assert cmt.gpgsig == fixture_sig
 
 		cmt.gpgsig = "<test\ndummy\nsig>"
-		assert cmt.gpgsig != sig
+		assert cmt.gpgsig != fixture_sig
 
 		cstream = StringIO()
 		cmt._serialize(cstream)
@@ -312,7 +311,7 @@ def test_gpgsig(self):
 		cstream.seek(0)
 		cmt.gpgsig = None
 		cmt._deserialize(cstream)
-		assert cmt.gpgsig == "<test\ndummy\nsig>\n"
+		assert cmt.gpgsig == "<test\ndummy\nsig>"
 
 		cmt.gpgsig = None
 		cstream = StringIO()
