Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/sshpeer.py @ 36081:223ed0b53f08
py3: more robustly cast UUID to bytes
The UUID type only has __str__ implemented. So we need to cast to
bytes on Python 3.
We need an actual bytes instance here (bytestr won't do) because
the re.escape() later iterates over characters and characters
need to behave like ints, not bytes instances of length 1.
Differential Revision: https://phab.mercurial-scm.org/D2144
| author | Gregory Szorc <gregory.szorc@gmail.com> |
|---|---|
| date | Sun, 11 Feb 2018 13:23:26 -0800 |
| parents | 59e4a7781a36 |
| children | 7218e93ade47 |
comparison
equal
deleted
inserted
replaced
| 36080:4fe2041007ed | 36081:223ed0b53f08 |
|---|---|
| 218 | 218 |
| 219 requestlog = ui.configbool('devel', 'debug.peer-request') | 219 requestlog = ui.configbool('devel', 'debug.peer-request') |
| 220 | 220 |
| 221 # Generate a random token to help identify responses to version 2 | 221 # Generate a random token to help identify responses to version 2 |
| 222 # upgrade request. | 222 # upgrade request. |
| 223 token = bytes(uuid.uuid4()) | 223 token = pycompat.sysbytes(str(uuid.uuid4())) |
| 224 upgradecaps = [ | 224 upgradecaps = [ |
| 225 ('proto', wireprotoserver.SSHV2), | 225 ('proto', wireprotoserver.SSHV2), |
| 226 ] | 226 ] |
| 227 upgradecaps = util.urlreq.urlencode(upgradecaps) | 227 upgradecaps = util.urlreq.urlencode(upgradecaps) |
| 228 | 228 |