Bladeren bron

Fix Python3.

Jelmer Vernooij 7 jaren geleden
bovenliggende
commit
f31f21e85a
2 gewijzigde bestanden met toevoegingen van 4 en 4 verwijderingen
  1. 1 1
      dulwich/ignore.py
  2. 3 3
      dulwich/tests/test_ignore.py

+ 1 - 1
dulwich/ignore.py

@@ -308,7 +308,7 @@ class IgnoreFilterManager(object):
                 if i < len(parts):
                     # Paths leading up to the final part are all directories,
                     # so need a trailing slash.
-                    relpath += b'/'
+                    relpath += '/'
                 matches = list(f.find_matching(relpath))
                 if matches:
                     return iter(matches)

+ 3 - 3
dulwich/tests/test_ignore.py

@@ -209,9 +209,9 @@ class IgnoreFilterManagerTests(TestCase):
         self.assertTrue(m.is_ignored(os.path.join(repo.path, 'excluded')))
         self.assertTrue(m.is_ignored(os.path.join(
             repo.path, 'dir2', 'fileinignoreddir')))
-        self.assertFalse(m.is_ignored(b'dir3'))
-        self.assertTrue(m.is_ignored(b'dir3/'))
-        self.assertTrue(m.is_ignored(b'dir3/bla'))
+        self.assertFalse(m.is_ignored('dir3'))
+        self.assertTrue(m.is_ignored('dir3/'))
+        self.assertTrue(m.is_ignored('dir3/bla'))
 
     def test_load_ignore_ignorecase(self):
         tmp_dir = tempfile.mkdtemp()