diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-04-09 23:40:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-09 23:40:44 +0100 |
| commit | 8eaa141d8f1ffb4a437bc9e9220febde51e3497e (patch) | |
| tree | 736679fd840ff67f9844dc99b9be7db0c6b71623 /contrib | |
| parent | Merge pull request #3016 from silkeh/improve-service-lookups (diff) | |
| parent | Replace some type checks with six type checks (diff) | |
| download | synapse-8eaa141d8f1ffb4a437bc9e9220febde51e3497e.tar.xz | |
Merge pull request #3075 from NotAFile/six-type-checks
Replace some type checks with six type checks
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/graph/graph3.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/contrib/graph/graph3.py b/contrib/graph/graph3.py index 88d92c89d7..7d3b4d7eb6 100644 --- a/contrib/graph/graph3.py +++ b/contrib/graph/graph3.py @@ -22,6 +22,8 @@ import argparse from synapse.events import FrozenEvent from synapse.util.frozenutils import unfreeze +from six import string_types + def make_graph(file_name, room_id, file_prefix, limit): print "Reading lines" @@ -58,7 +60,7 @@ def make_graph(file_name, room_id, file_prefix, limit): for key, value in unfreeze(event.get_dict()["content"]).items(): if value is None: value = "<null>" - elif isinstance(value, basestring): + elif isinstance(value, string_types): pass else: value = json.dumps(value) |