diff options
| author | Andrew Morgan <andrew@amorgan.xyz> | 2020-08-03 16:15:34 -0700 |
|---|---|---|
| committer | Andrew Morgan <andrew@amorgan.xyz> | 2020-08-03 16:15:34 -0700 |
| commit | 48e7f210c6655b83a2f719acb7f41cf0fece10a1 (patch) | |
| tree | 961b66bdd6b432bc8af4f8519e4fce81bd2f4863 /scripts | |
| parent | Merge commit '98c4e35e3' into dinsic (diff) | |
| parent | Replace all remaining six usage with native Python 3 equivalents (#7704) (diff) | |
| download | synapse-48e7f210c6655b83a2f719acb7f41cf0fece10a1.tar.xz | |
Merge commit 'a3f11567d' into dinsic
* commit 'a3f11567d': Replace all remaining six usage with native Python 3 equivalents (#7704)
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/synapse_port_db | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/scripts/synapse_port_db b/scripts/synapse_port_db index 8e67626668..e5c31fdb13 100755 --- a/scripts/synapse_port_db +++ b/scripts/synapse_port_db @@ -23,8 +23,6 @@ import sys import time import traceback -from six import string_types - import yaml from twisted.internet import defer, reactor @@ -637,7 +635,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, |