Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-09-26 04:50:52 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3247 from NotAFile/py3-misc

Browse source 
Misc Python3 fixes
This commit is contained in:
Amber Brown 2018-05-24 12:58:37 -05:00 • committed by GitHub
commit 36501068d8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
synapse/util/caches/__init__.py
View file

@ -16,6 +16,9 @@
import synapse.metrics
import os
from six.moves import intern
import six
CACHE_SIZE_FACTOR = float(os.environ.get("SYNAPSE_CACHE_FACTOR", 0.5))
metrics = synapse.metrics.get_metrics_for("synapse.util.caches")
@ -66,7 +69,9 @@ def intern_string(string):
return None
try:
string = string.encode("ascii")
if six.PY2:
string = string.encode("ascii")
return intern(string)
except UnicodeEncodeError:
return string