diff options
| author | Jonathan de Jong <jonathandejong02@gmail.com> | 2020-09-17 14:37:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-17 08:37:01 -0400 |
| commit | 837293c314b47e988fe9532115476a6536cd6406 (patch) | |
| tree | 9d0ec87ddbe4372a07f8b8053b3f8e3e5c3bd3ee /contrib | |
| parent | Use admin_patterns for all admin APIs. (#8331) (diff) | |
| download | synapse-837293c314b47e988fe9532115476a6536cd6406.tar.xz | |
Remove obsolete __future__ imports (#8337)
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/cmdclient/console.py | 2 | ||||
| -rw-r--r-- | contrib/cmdclient/http.py | 2 | ||||
| -rw-r--r-- | contrib/graph/graph.py | 2 | ||||
| -rw-r--r-- | contrib/graph/graph3.py | 2 | ||||
| -rw-r--r-- | contrib/jitsimeetbridge/jitsimeetbridge.py | 2 | ||||
| -rwxr-xr-x | contrib/scripts/kick_users.py | 8 |
6 files changed, 1 insertions, 17 deletions
diff --git a/contrib/cmdclient/console.py b/contrib/cmdclient/console.py index dfc1d294dc..ab1e1f1f4c 100755 --- a/contrib/cmdclient/console.py +++ b/contrib/cmdclient/console.py @@ -15,8 +15,6 @@ # limitations under the License. """ Starts a synapse client console. """ -from __future__ import print_function - import argparse import cmd import getpass diff --git a/contrib/cmdclient/http.py b/contrib/cmdclient/http.py index cd3260b27d..345120b612 100644 --- a/contrib/cmdclient/http.py +++ b/contrib/cmdclient/http.py @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -from __future__ import print_function - import json import urllib from pprint import pformat diff --git a/contrib/graph/graph.py b/contrib/graph/graph.py index de33fac1c7..fdbac087bd 100644 --- a/contrib/graph/graph.py +++ b/contrib/graph/graph.py @@ -1,5 +1,3 @@ -from __future__ import print_function - import argparse import cgi import datetime diff --git a/contrib/graph/graph3.py b/contrib/graph/graph3.py index 91db98e7ef..dd0c19368b 100644 --- a/contrib/graph/graph3.py +++ b/contrib/graph/graph3.py @@ -1,5 +1,3 @@ -from __future__ import print_function - import argparse import cgi import datetime diff --git a/contrib/jitsimeetbridge/jitsimeetbridge.py b/contrib/jitsimeetbridge/jitsimeetbridge.py index 69aa74bd34..b3de468687 100644 --- a/contrib/jitsimeetbridge/jitsimeetbridge.py +++ b/contrib/jitsimeetbridge/jitsimeetbridge.py @@ -10,8 +10,6 @@ the bridge. Requires: npm install jquery jsdom """ -from __future__ import print_function - import json import subprocess import time diff --git a/contrib/scripts/kick_users.py b/contrib/scripts/kick_users.py index 372dbd9e4f..f8e0c732fb 100755 --- a/contrib/scripts/kick_users.py +++ b/contrib/scripts/kick_users.py @@ -1,5 +1,4 @@ #!/usr/bin/env python -from __future__ import print_function import json import sys @@ -8,11 +7,6 @@ from argparse import ArgumentParser import requests -try: - raw_input -except NameError: # Python 3 - raw_input = input - def _mkurl(template, kws): for key in kws: @@ -58,7 +52,7 @@ def main(hs, room_id, access_token, user_id_prefix, why): print("The following user IDs will be kicked from %s" % room_name) for uid in kick_list: print(uid) - doit = raw_input("Continue? [Y]es\n") + doit = input("Continue? [Y]es\n") if len(doit) > 0 and doit.lower() == "y": print("Kicking members...") # encode them all |