diff options
| author | Amber Brown <hawkowl@atleastfornow.net> | 2018-08-20 23:54:49 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-20 23:54:49 +1000 |
| commit | 324525f40ca4df19c43971ca82db0d3478114885 (patch) | |
| tree | 05e6a1e45e711c9d5d18b7fbf31c79aa03fb0657 /synapse/secrets.py | |
| parent | Merge pull request #3719 from matrix-org/erikj/use_cache_fact (diff) | |
| download | synapse-324525f40ca4df19c43971ca82db0d3478114885.tar.xz | |
Port over enough to get some sytests running on Python 3 (#3668)
Diffstat (limited to 'synapse/secrets.py')
| -rw-r--r-- | synapse/secrets.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/secrets.py b/synapse/secrets.py index f05e9ea535..f6280f951c 100644 --- a/synapse/secrets.py +++ b/synapse/secrets.py @@ -38,4 +38,4 @@ else: return os.urandom(nbytes) def token_hex(self, nbytes=32): - return binascii.hexlify(self.token_bytes(nbytes)) + return binascii.hexlify(self.token_bytes(nbytes)).decode('ascii') |