mirror of
https://github.com/element-hq/synapse.git
synced 2026-10-22 17:32:43 +00:00
Replace all remaining six usage with native Python 3 equivalents (#7704)
This commit is contained in:
1 parent
98c4e35e3c
commit
a3f11567d9
73 files changed
+111
-237
No files matched your search
@@ -23,8 +23,6 @@ import sys
|
||||
import time
|
||||
import traceback
|
||||
|
||||
from six import string_types
|
||||
|
||||
import yaml
|
||||
|
||||
from twisted.internet import defer, reactor
|
||||
@@ -635,7 +633,7 @@ class Porter(object):
|
||||
return bool(col)
|
||||
if isinstance(col, bytes):
|
||||
return bytearray(col)
|
||||
elif isinstance(col, string_types) and "\0" in col:
|
||||
elif isinstance(col, str) and "\0" in col:
|
||||
logger.warning(
|
||||
"DROPPING ROW: NUL value in table %s col %s: %r",
|
||||
table,
|
||||
|
||||
Reference in new issue
Block a user