Show More
@@ -407,8 +407,15 b' def overridewalk(orig, self, match, subr' | |||||
407 | # for name case changes. |
|
407 | # for name case changes. | |
408 | for entry in result[b'files']: |
|
408 | for entry in result[b'files']: | |
409 | fname = entry[b'name'] |
|
409 | fname = entry[b'name'] | |
|
410 | ||||
|
411 | # Watchman always give us a str. Normalize to bytes on Python 3 | |||
|
412 | # using Watchman's encoding, if needed. | |||
|
413 | if not isinstance(fname, bytes): | |||
|
414 | fname = fname.encode(_watchmanencoding) | |||
|
415 | ||||
410 | if _fixencoding: |
|
416 | if _fixencoding: | |
411 | fname = _watchmantofsencoding(fname) |
|
417 | fname = _watchmantofsencoding(fname) | |
|
418 | ||||
412 | if switch_slashes: |
|
419 | if switch_slashes: | |
413 | fname = fname.replace(b'\\', b'/') |
|
420 | fname = fname.replace(b'\\', b'/') | |
414 | if normalize: |
|
421 | if normalize: |
General Comments 0
You need to be logged in to leave comments.
Login now