Mercurial > hg
comparison hgext/fsmonitor/__init__.py @ 43403:90fba2248693 stable
fsmonitor: use stringutil.forcebytestr() instead of str() on an exception
Similar to 5fa8ac91190e / D7206, should get test-install.t passing on py3.
Differential Revision: https://phab.mercurial-scm.org/D7218
| author | Ian Moody <moz-ian@perix.co.uk> |
|---|---|
| date | Mon, 04 Nov 2019 19:05:44 +0000 |
| parents | 09ab61c0ab4b |
| children | 2d49482d0dd4 |
comparison
equal
deleted
inserted
replaced
| 43402:40bf3d7ecc42 | 43403:90fba2248693 |
|---|---|
| 191 b"fsmonitor-watchman-version", | 191 b"fsmonitor-watchman-version", |
| 192 _(b" watchman binary version %s\n"), | 192 _(b" watchman binary version %s\n"), |
| 193 pycompat.bytestr(v["version"]), | 193 pycompat.bytestr(v["version"]), |
| 194 ) | 194 ) |
| 195 except watchmanclient.Unavailable as e: | 195 except watchmanclient.Unavailable as e: |
| 196 err = str(e) | 196 err = stringutil.forcebytestr(e) |
| 197 fm.condwrite( | 197 fm.condwrite( |
| 198 err, | 198 err, |
| 199 b"fsmonitor-watchman-error", | 199 b"fsmonitor-watchman-error", |
| 200 _(b" watchman binary missing or broken: %s\n"), | 200 _(b" watchman binary missing or broken: %s\n"), |
| 201 err, | 201 err, |