Commit7548a5c

committed

Merge pull requestgitpython-developers#459 from andy-maier/fix-457-typerror-on-py26

Fixesgitpython-developers#457: 'TypeError: decode() takes no keyword arguments' on Python 2.6

2 parents2219f13 +55969cb commit7548a5cCopy full SHA for 7548a5c

File tree

-4

lines changed

-4

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,8 @@ Changelog`
`5`	`5`	`2.0.6 - Fixes`
`6`	`6`	`=============`
`7`	`7`
`8`		`-* ...`
	`8`	`+* Fix: TypeError about passing keyword argument to string decode() on`
	`9`	`+ Python 2.6.`
`9`	`10`
`10`	`11`	`2.0.5 - Fixes`
`11`	`12`	`=============`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -501,14 +501,14 @@ def _deserialize(self, stream):`
`501`	`501`
`502`	`502`	`try:`
`503`	`503`	`self.author,self.authored_date,self.author_tz_offset= \`
`504`		`-parse_actor_and_date(author_line.decode(self.encoding,errors='replace'))`
	`504`	`+parse_actor_and_date(author_line.decode(self.encoding,'replace'))`
`505`	`505`	`exceptUnicodeDecodeError:`
`506`	`506`	`log.error("Failed to decode author line '%s' using encoding %s",author_line,self.encoding,`
`507`	`507`	`exc_info=True)`
`508`	`508`
`509`	`509`	`try:`
`510`	`510`	`self.committer,self.committed_date,self.committer_tz_offset= \`
`511`		`-parse_actor_and_date(committer_line.decode(self.encoding,errors='replace'))`
	`511`	`+parse_actor_and_date(committer_line.decode(self.encoding,'replace'))`
`512`	`512`	`exceptUnicodeDecodeError:`
`513`	`513`	`log.error("Failed to decode committer line '%s' using encoding %s",committer_line,self.encoding,`
`514`	`514`	`exc_info=True)`
`@@ -518,7 +518,7 @@ def _deserialize(self, stream):`
`518`	`518`	`# The end of our message stream is marked with a newline that we strip`
`519`	`519`	`self.message=stream.read()`
`520`	`520`	`try:`
`521`		`-self.message=self.message.decode(self.encoding,errors='replace')`
	`521`	`+self.message=self.message.decode(self.encoding,'replace')`
`522`	`522`	`exceptUnicodeDecodeError:`
`523`	`523`	`log.error("Failed to decode message '%s' using encoding %s",self.message,self.encoding,exc_info=True)`
`524`	`524`	`# END exception handling`

Comments

(0)