|
12 | 12 | ) |
13 | 13 | from git.util import finalize_process, hex_to_bin |
14 | 14 |
|
15 | | -from .compat import binary_type |
16 | 15 | from .objects.blob import Blob |
17 | 16 | from .objects.util import mode_str_to_int |
18 | 17 |
|
@@ -268,8 +267,8 @@ def __init__(self, repo, a_rawpath, b_rawpath, a_blob_id, b_blob_id, a_mode, |
268 | 267 | self.a_mode = a_mode |
269 | 268 | self.b_mode = b_mode |
270 | 269 |
|
271 | | - assert a_rawpath is None or isinstance(a_rawpath,binary_type) |
272 | | - assert b_rawpath is None or isinstance(b_rawpath,binary_type) |
| 270 | + assert a_rawpath is None or isinstance(a_rawpath,bytes) |
| 271 | + assert b_rawpath is None or isinstance(b_rawpath,bytes) |
273 | 272 | self.a_rawpath = a_rawpath |
274 | 273 | self.b_rawpath = b_rawpath |
275 | 274 |
|
@@ -302,8 +301,8 @@ def __init__(self, repo, a_rawpath, b_rawpath, a_blob_id, b_blob_id, a_mode, |
302 | 301 | self.copied_file = copied_file |
303 | 302 |
|
304 | 303 | # be clear and use None instead of empty strings |
305 | | - assert raw_rename_from is None or isinstance(raw_rename_from,binary_type) |
306 | | - assert raw_rename_to is None or isinstance(raw_rename_to,binary_type) |
| 304 | + assert raw_rename_from is None or isinstance(raw_rename_from,bytes) |
| 305 | + assert raw_rename_to is None or isinstance(raw_rename_to,bytes) |
307 | 306 | self.raw_rename_from = raw_rename_from or None |
308 | 307 | self.raw_rename_to = raw_rename_to or None |
309 | 308 |
|
|