Commitf7180d5

committed

Use urllib instead of custom parsing

1 parentb650c4f commitf7180d5Copy full SHA for f7180d5

File tree

+10

-4

lines changed

+10

-4

lines changed

Lines changed: 10 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`	`importos`
`10`	`10`	`importre`
`11`	`11`	`importwarnings`
	`12`	`+fromurllib.parseimporturlsplit,urlunsplit`
`12`	`13`
`13`	`14`	`fromgit.cmdimport (`
`14`	`15`	`Git,`
`@@ -971,10 +972,15 @@ def _clone(cls, git, url, path, odb_default_type, progress, multi_options=None,`
`971`	`972`	`(stdout,stderr)=proc.communicate()`
`972`	`973`	`cmdline=getattr(proc,'args','')`
`973`	`974`	`uri=cmdline[-2]`
`974`		`-if"://"inuriand"@"inuri:`
`975`		`-cred=uri.split("://")[1].split("@")[0].split(":")`
`976`		`-iflen(cred)==2:`
`977`		`-cmdline[-2]=uri.replace(cred[1],"******")`
	`975`	`+try:`
	`976`	`+url=urlsplit(uri)`
	`977`	`+# Remove password from the URL if present`
	`978`	`+ifurl.password:`
	`979`	`+edited_url=url._replace(`
	`980`	`+netloc=url.netloc.replace(url.password,"****"))`
	`981`	`+cmdline[-2]=urlunsplit(edited_url)`
	`982`	`+exceptValueError:`
	`983`	`+log.debug("Unable to parse the URL %s",url)`
`978`	`984`	`log.debug("Cmd(%s)'s unused stdout: %s",cmdline,stdout)`
`979`	`985`	`finalize_process(proc,stderr=stderr)`
`980`	`986`

Comments

(0)