Merge branch 'master' into experimental

dulwich/index.py

@@ -557,15 +557,18 @@ def _tree_to_fs_path(root_path, tree_path):
     return os.path.join(root_path, sep_corrected_path)
 
 
-def _fs_to_tree_path(fs_path):
+def _fs_to_tree_path(fs_path, fs_encoding=None):
     """Convert a file system path to a git tree path.
 
     :param fs_path: File system path.
+    :param fs_encoding: File system encoding
 
     :return:  Git tree path as bytes
     """
+    if fs_encoding is None:
+        fs_encoding = sys.getfilesystemencoding()
     if not isinstance(fs_path, bytes):
-        fs_path_bytes = fs_path.encode(sys.getfilesystemencoding())
+        fs_path_bytes = fs_path.encode(fs_encoding)
     else:
         fs_path_bytes = fs_path
     if os_sep_bytes != b'/':

dulwich/tests/test_index.py

@@ -491,10 +491,10 @@ class TestTreeFSPathConversion(TestCase):
 
     def test_fs_to_tree_path_str(self):
         fs_path = os.path.join(os.path.join(u'délwíçh', u'foo'))
-        tree_path = _fs_to_tree_path(fs_path)
-        self.assertEqual(tree_path, u'délwíçh/foo'.encode(sys.getfilesystemencoding()))
+        tree_path = _fs_to_tree_path(fs_path, "utf-8")
+        self.assertEqual(tree_path, u'délwíçh/foo'.encode("utf-8"))
 
     def test_fs_to_tree_path_bytes(self):
         fs_path = os.path.join(os.path.join(u'délwíçh', u'foo').encode('utf8'))
-        tree_path = _fs_to_tree_path(fs_path)
+        tree_path = _fs_to_tree_path(fs_path, "utf-8")
         self.assertEqual(tree_path, u'délwíçh/foo'.encode('utf8'))

dulwich/tests/test_repository.py

@@ -52,11 +52,6 @@ from dulwich.tests.utils import (
 missing_sha = b'b91fa4d900e17e99b433218e988c4eb4a3e9a097'
 
 
-def mkdtemp_unicode():
-    suffix = u'délwíçh'
-    return tempfile.mkdtemp(suffix=suffix)
-
-
 class CreateRepositoryTests(TestCase):
 
     def assertFileContentsEqual(self, expected, repo, path):
@@ -82,14 +77,14 @@ class CreateRepositoryTests(TestCase):
         self._check_repo_contents(repo, True)
 
     def test_create_disk_bare(self):
-        tmp_dir = mkdtemp_unicode()
+        tmp_dir = tempfile.mkdtemp()
         self.addCleanup(shutil.rmtree, tmp_dir)
         repo = Repo.init_bare(tmp_dir)
         self.assertEqual(tmp_dir, repo._controldir)
         self._check_repo_contents(repo, True)
 
     def test_create_disk_non_bare(self):
-        tmp_dir = mkdtemp_unicode()
+        tmp_dir = tempfile.mkdtemp()
         self.addCleanup(shutil.rmtree, tmp_dir)
         repo = Repo.init(tmp_dir)
         self.assertEqual(os.path.join(tmp_dir, '.git'), repo._controldir)
@@ -99,7 +94,7 @@ class CreateRepositoryTests(TestCase):
 class RepositoryRootTests(TestCase):
 
     def mkdtemp(self):
-        return mkdtemp_unicode()
+        return tempfile.mkdtemp()
 
     def open_repo(self, name):
         temp_dir = self.mkdtemp()
@@ -515,7 +510,7 @@ class BuildRepoRootTests(TestCase):
     """
 
     def get_repo_dir(self):
-        return os.path.join(mkdtemp_unicode(), 'test')
+        return os.path.join(tempfile.mkdtemp(), 'test')
 
     def setUp(self):
         super(BuildRepoRootTests, self).setUp()