summaryrefslogtreecommitdiff
path: root/git/cmd.py
diff options
context:
space:
mode:
authorSebastian Thiel <byronimo@gmail.com>2014-11-12 09:23:33 +0100
committerSebastian Thiel <byronimo@gmail.com>2014-11-12 09:23:33 +0100
commit6404168e6f990462c32dbe5c7ac1ec186f88c648 (patch)
tree64c08205f8b515f89fee0013244bdf180bd40c42 /git/cmd.py
parent27c577dfd5c7f0fc75cd10ed6606674b56b405bd (diff)
parentc390e223553964fc8577d6837caf19037c4cd6f6 (diff)
downloadgitpython-6404168e6f990462c32dbe5c7ac1ec186f88c648.tar.gz
Merge pull request #200 from dbaxa/0.3-with-unicode-fixes
0.3 with unicode fixes
Diffstat (limited to 'git/cmd.py')
-rw-r--r--git/cmd.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/git/cmd.py b/git/cmd.py
index b3274dd8..73126fba 100644
--- a/git/cmd.py
+++ b/git/cmd.py
@@ -410,12 +410,16 @@ class Git(LazyMixin):
@classmethod
def __unpack_args(cls, arg_list):
if not isinstance(arg_list, (list,tuple)):
+ if isinstance(arg_list, unicode):
+ return [arg_list.encode('utf-8')]
return [ str(arg_list) ]
outlist = list()
for arg in arg_list:
if isinstance(arg_list, (list, tuple)):
outlist.extend(cls.__unpack_args( arg ))
+ elif isinstance(arg_list, unicode):
+ outlist.append(arg_list.encode('utf-8'))
# END recursion
else:
outlist.append(str(arg))