mirror of
https://github.com/element-hq/synapse
synced 2024-08-20 06:10:21 +00:00
fix py3 intern and remove unnecessary py3 encode
Signed-off-by: Adrian Tschira <nota@notafile.com>
This commit is contained in:
parent
aafb0f6b0d
commit
73cbdef5f7
1 changed files with 6 additions and 1 deletions
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue