diff options
Diffstat (limited to 'git_config.py')
-rw-r--r-- | git_config.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git_config.py b/git_config.py index 680de90f..8de3200c 100644 --- a/git_config.py +++ b/git_config.py | |||
@@ -528,7 +528,7 @@ def GetUrlCookieFile(url, quiet): | |||
528 | cookiefile = None | 528 | cookiefile = None |
529 | proxy = None | 529 | proxy = None |
530 | for line in p.stdout: | 530 | for line in p.stdout: |
531 | line = line.strip() | 531 | line = line.strip().decode('utf-8') |
532 | if line.startswith(cookieprefix): | 532 | if line.startswith(cookieprefix): |
533 | cookiefile = os.path.expanduser(line[len(cookieprefix):]) | 533 | cookiefile = os.path.expanduser(line[len(cookieprefix):]) |
534 | if line.startswith(proxyprefix): | 534 | if line.startswith(proxyprefix): |
@@ -540,7 +540,7 @@ def GetUrlCookieFile(url, quiet): | |||
540 | finally: | 540 | finally: |
541 | p.stdin.close() | 541 | p.stdin.close() |
542 | if p.wait(): | 542 | if p.wait(): |
543 | err_msg = p.stderr.read() | 543 | err_msg = p.stderr.read().decode('utf-8') |
544 | if ' -print_config' in err_msg: | 544 | if ' -print_config' in err_msg: |
545 | pass # Persistent proxy doesn't support -print_config. | 545 | pass # Persistent proxy doesn't support -print_config. |
546 | elif not quiet: | 546 | elif not quiet: |