[Python-modules-commits] [python-git] 06/08: merge patched into master

[Barry Warsaw]

This is an automated email from the git hooks/post-receive script.

barry pushed a commit to branch master
in repository python-git.

commit afb591c8381e7d6417f014237f857d0ed7acc8c2
Merge: 989dd8a d9fe5ff
Author: Barry Warsaw <barry at python.org>
Date:   Wed Jun 15 13:50:52 2016 +0300

    merge patched into master

 debian/.git-dpm                           |  4 +-
 debian/patches/issue470-safe-decode.patch | 57 ++++++++++++++++++++++++
 debian/patches/series                     |  1 +
 debian/patches/wheezy-dsc-patch           | 72 -------------------------------
 git/cmd.py                                | 11 ++---
 5 files changed, 66 insertions(+), 79 deletions(-)

diff --cc debian/.git-dpm
index 19f85f0,0000000..36df55d
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 673a76fe139b987b1c91ee01bf88a3ea956b5129
- 673a76fe139b987b1c91ee01bf88a3ea956b5129
++d9fe5fffd84389eb8e8e5a74606eb7c8523877d4
++d9fe5fffd84389eb8e8e5a74606eb7c8523877d4
 +673a76fe139b987b1c91ee01bf88a3ea956b5129
 +673a76fe139b987b1c91ee01bf88a3ea956b5129
 +python-git_2.0.5.orig.tar.gz
 +9059a8a53b33f2268daa9dd78be8ce7af62a66c3
 +404610
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/issue470-safe-decode.patch
index 0000000,0000000..193a31b
new file mode 100644
--- /dev/null
+++ b/debian/patches/issue470-safe-decode.patch
@@@ -1,0 -1,0 +1,57 @@@
++From d9fe5fffd84389eb8e8e5a74606eb7c8523877d4 Mon Sep 17 00:00:00 2001
++From: Barry Warsaw <barry at python.org>
++Date: Wed, 15 Jun 2016 13:48:10 +0300
++Subject: =?UTF-8?q?Description:=20Calling=20a=20git=20command=20(e.g.=20`s?=
++ =?UTF-8?q?how`)=20that=20contains=20invalid=0A=20UTF-8=20will=20cause=20a?=
++ =?UTF-8?q?=20UnicodeDecodeError.=0AAuthor:=20Barry=20Warsaw=20<barry at ubun?=
++ =?UTF-8?q?tu.com>=0ABug:=20https://github.com/gitpython-developers/GitPyt?=
++ =?UTF-8?q?hon/issues/470?=
++
++Patch-Name: issue470-safe-decode.patch
++---
++ git/cmd.py | 11 ++++++-----
++ 1 file changed, 6 insertions(+), 5 deletions(-)
++
++diff --git a/git/cmd.py b/git/cmd.py
++index c29e348..955b25b 100644
++--- a/git/cmd.py
+++++ b/git/cmd.py
++@@ -39,7 +39,8 @@ from git.compat import (
++     PY3,
++     bchr,
++     # just to satisfy flake8 on py3
++-    unicode
+++    unicode,
+++    safe_decode,
++ )
++ 
++ execute_kwargs = ('istream', 'with_keep_cwd', 'with_extended_output',
++@@ -688,12 +689,12 @@ class Git(LazyMixin):
++             cmdstr = " ".join(command)
++ 
++             def as_text(stdout_value):
++-                return not output_stream and stdout_value.decode(defenc) or '<OUTPUT_STREAM>'
+++                return not output_stream and safe_decode(stdout_value) or '<OUTPUT_STREAM>'
++             # end
++ 
++             if stderr_value:
++                 log.info("%s -> %d; stdout: '%s'; stderr: '%s'",
++-                         cmdstr, status, as_text(stdout_value), stderr_value.decode(defenc))
+++                         cmdstr, status, as_text(stdout_value), safe_decode(stderr_value))
++             elif stdout_value:
++                 log.info("%s -> %d; stdout: '%s'", cmdstr, status, as_text(stdout_value))
++             else:
++@@ -707,11 +708,11 @@ class Git(LazyMixin):
++                 raise GitCommandError(command, status, stderr_value)
++ 
++         if isinstance(stdout_value, bytes) and stdout_as_string:  # could also be output_stream
++-            stdout_value = stdout_value.decode(defenc)
+++            stdout_value = safe_decode(stdout_value)
++ 
++         # Allow access to the command's status code
++         if with_extended_output:
++-            return (status, stdout_value, stderr_value.decode(defenc))
+++            return (status, stdout_value, safe_decode(stderr_value))
++         else:
++             return stdout_value
++ 
diff --cc debian/patches/series
index 0000000,0000000..0e4a2c7
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++issue470-safe-decode.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-git.git