Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit930d03f

Browse files
authored
Merge pull requestgitpython-developers#475 from warsaw/issue470
Fix issuegitpython-developers#470
2 parents105a8c0 +dc2ec79 commit930d03f

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

‎git/cmd.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@
3939
PY3,
4040
bchr,
4141
# just to satisfy flake8 on py3
42-
unicode
42+
unicode,
43+
safe_decode,
4344
)
4445

4546
execute_kwargs= ('istream','with_keep_cwd','with_extended_output',
@@ -693,12 +694,12 @@ def _kill_process(pid):
693694
cmdstr=" ".join(command)
694695

695696
defas_text(stdout_value):
696-
returnnotoutput_streamandstdout_value.decode(defenc)or'<OUTPUT_STREAM>'
697+
returnnotoutput_streamandsafe_decode(stdout_value)or'<OUTPUT_STREAM>'
697698
# end
698699

699700
ifstderr_value:
700701
log.info("%s -> %d; stdout: '%s'; stderr: '%s'",
701-
cmdstr,status,as_text(stdout_value),stderr_value.decode(defenc))
702+
cmdstr,status,as_text(stdout_value),safe_decode(stderr_value))
702703
elifstdout_value:
703704
log.info("%s -> %d; stdout: '%s'",cmdstr,status,as_text(stdout_value))
704705
else:
@@ -712,11 +713,11 @@ def as_text(stdout_value):
712713
raiseGitCommandError(command,status,stderr_value)
713714

714715
ifisinstance(stdout_value,bytes)andstdout_as_string:# could also be output_stream
715-
stdout_value=stdout_value.decode(defenc)
716+
stdout_value=safe_decode(stdout_value)
716717

717718
# Allow access to the command's status code
718719
ifwith_extended_output:
719-
return (status,stdout_value,stderr_value.decode(defenc))
720+
return (status,stdout_value,safe_decode(stderr_value))
720721
else:
721722
returnstdout_value
722723

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp