Fix shlex use on python2.6.

dulwich/client.py

@@ -976,8 +976,10 @@ class SSHGitClient(TraditionalGitClient):
         self.alternative_paths = {}
 
     def _get_cmd_path(self, cmd):
-        cmd = cmd.decode('ascii')
-        return shlex.split(self.alternative_paths.get(cmd, 'git-' + cmd))
+        cmd = self.alternative_paths.get(cmd, 'git-' + cmd)
+        cmd = shlex.split(cmd)
+        cmd = [x.decode('ascii') for x in cmd]
+        return cmd
 
     def _connect(self, cmd, path):
         if path.startswith("/~"):

dulwich/tests/test_blackbox.py

@@ -49,7 +49,7 @@ class GitReceivePackTests(BlackboxTestCase):
         (stdout, stderr) = process.communicate()
         self.assertEqual(
             [b'usage: dul-receive-pack <git-dir>'],
-            stderr.splitlines()[:-1])
+            stderr.splitlines()[-1:])
         self.assertEqual(b'', stdout)
         self.assertEqual(1, process.returncode)
 
@@ -68,6 +68,6 @@ class GitUploadPackTests(BlackboxTestCase):
         (stdout, stderr) = process.communicate()
         self.assertEqual(
             [b'usage: dul-upload-pack <git-dir>'],
-            stderr.splitlines()[:-1])
+            stderr.splitlines()[-1:])
         self.assertEqual(b'', stdout)
         self.assertEqual(1, process.returncode)