Commit5efdad2

committed

fix(remote): py3 compatibility

1 parent515a6b9 commit5efdad2Copy full SHA for 5efdad2

File tree

-2

lines changed

-2

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@`
`32`	`32`	`)`
`33`	`33`	`fromgit.cmdimporthandle_process_output`
`34`	`34`	`fromgitdb.utilimportjoin`
`35`		`-fromgit.compatimportdefenc`
	`35`	`+fromgit.compatimport(defenc,safe_decode)`
`36`	`36`	`importlogging`
`37`	`37`
`38`	`38`	`log=logging.getLogger('git.remote')`
`@@ -551,7 +551,7 @@ def _get_fetch_info_from_stderr(self, proc, progress):`
`551`	`551`	`progress_handler=progress.new_message_handler()`
`552`	`552`
`553`	`553`	`forlineinproc.stderr:`
`554`		`-line=line.decode(defenc)`
	`554`	`+line=safe_decode(line)`
`555`	`555`	`forplineinprogress_handler(line):`
`556`	`556`	`ifline.startswith('fatal:')orline.startswith('error:'):`
`557`	`557`	`raiseGitCommandError(("Error when fetching: %s"%line,),2)`

Comments

(0)