Merge pull request #175 from craigez/feature/handle_utf8

Handling unicode arguments

Author: Byron

git/cmd.py

@@ -426,12 +426,16 @@ def transform_kwargs(self, **kwargs):
 @classmethod
 def__unpack_args(cls, arg_list):
 ifnotisinstance(arg_list, (list,tuple)):
+ifisinstance(arg_list, unicode):
+return [arg_list.encode('utf-8')]
 return [ str(arg_list) ]
 
 outlist=list()
 forarginarg_list:
 ifisinstance(arg_list, (list, tuple)):
 outlist.extend(cls.__unpack_args( arg ))
+elifisinstance(arg_list, unicode):
+outlist.append(arg_list.encode('utf-8'))
 # END recursion 
 else:
 outlist.append(str(arg))

git/test/test_cmd.py

@@ -6,8 +6,8 @@
 
 importos, sys
 fromgit.test.libimport (
-TestBase,
-patch,
+TestBase,
+patch,
 raises,
 assert_equal,
 assert_true,
@@ -17,7 +17,7 @@
 fromgitimportGit, GitCommandError
 
 classTestGit(TestBase):
-
+
 @classmethod
 defsetUp(cls):
 super(TestGit, cls).setUp()
@@ -30,6 +30,14 @@ def test_call_process_calls_execute(self, git):
 assert_true(git.called)
 assert_equal(git.call_args, ((['git', 'version'],),{}))
 
+deftest_call_unpack_args_unicode(self):
+args=Git._Git__unpack_args(u'Unicode'+unichr(40960))
+assert_equal(args, ['Unicode\xea\x80\x80'])
+
+deftest_call_unpack_args(self):
+args=Git._Git__unpack_args(['git', 'log', '--', u'Unicode'+unichr(40960)])
+assert_equal(args, ['git', 'log', '--', 'Unicode\xea\x80\x80'])
+
 @raises(GitCommandError)
 deftest_it_raises_errors(self):
 self.git.this_does_not_exist()
@@ -59,7 +67,7 @@ def test_it_ignores_false_kwargs(self, git):
 # this_should_not_be_ignored=False implies it *should* be ignored
 output=self.git.version(pass_this_kwarg=False)
 assert_true("pass_this_kwarg"notingit.call_args[1])
-
+
 deftest_persistent_cat_file_command(self):
 # read header only
 importsubprocessassp
@@ -68,37 +76,37 @@ def test_persistent_cat_file_command(self):
 g.stdin.write("b2339455342180c7cc1e9bba3e9f181f7baa5167\n")
 g.stdin.flush()
 obj_info=g.stdout.readline()
-
+
 # read header + data
 g=self.git.cat_file(batch=True, istream=sp.PIPE,as_process=True)
 g.stdin.write("b2339455342180c7cc1e9bba3e9f181f7baa5167\n")
 g.stdin.flush()
 obj_info_two=g.stdout.readline()
 assertobj_info==obj_info_two
-
+
 # read data - have to read it in one large chunk
 size=int(obj_info.split()[2])
 data=g.stdout.read(size)
 terminating_newline=g.stdout.read(1)
-
+
 # now we should be able to read a new object
 g.stdin.write("b2339455342180c7cc1e9bba3e9f181f7baa5167\n")
 g.stdin.flush()
 assertg.stdout.readline() ==obj_info
-
-
+
+
 # same can be achived using the respective command functions
 hexsha, typename, size=self.git.get_object_header(hexsha)
 hexsha, typename_two, size_two, data=self.git.get_object_data(hexsha)
 asserttypename==typename_twoandsize==size_two
-
+
 deftest_version(self):
 v=self.git.version_info
 assertisinstance(v, tuple)
 forninv:
 assertisinstance(n, int)
 #END verify number types
-
+
 deftest_cmd_override(self):
 prev_cmd=self.git.GIT_PYTHON_GIT_EXECUTABLE
 try:
@@ -108,7 +116,7 @@ def test_cmd_override(self):
 finally:
  type(self.git).GIT_PYTHON_GIT_EXECUTABLE=prev_cmd
 #END undo adjustment
-
+
 deftest_output_strip(self):
 importsubprocessassp
 hexsha="b2339455342180c7cc1e9bba3e9f181f7baa5167"