Remove obsolete __future__ imports (#8337)

This commit is contained in:
Jonathan de Jong 2020-09-17 14:37:01 +02:00 committed by GitHub
parent c3c9732c53
commit 837293c314
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
19 changed files with 2 additions and 40 deletions

1
changelog.d/8337.misc Normal file
View File

@ -0,0 +1 @@
Remove `__future__` imports related to Python 2 compatibility.

View File

@ -15,8 +15,6 @@
# limitations under the License. # limitations under the License.
""" Starts a synapse client console. """ """ Starts a synapse client console. """
from __future__ import print_function
import argparse import argparse
import cmd import cmd
import getpass import getpass

View File

@ -13,8 +13,6 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
from __future__ import print_function
import json import json
import urllib import urllib
from pprint import pformat from pprint import pformat

View File

@ -1,5 +1,3 @@
from __future__ import print_function
import argparse import argparse
import cgi import cgi
import datetime import datetime

View File

@ -1,5 +1,3 @@
from __future__ import print_function
import argparse import argparse
import cgi import cgi
import datetime import datetime

View File

@ -10,8 +10,6 @@ the bridge.
Requires: Requires:
npm install jquery jsdom npm install jquery jsdom
""" """
from __future__ import print_function
import json import json
import subprocess import subprocess
import time import time

View File

@ -1,5 +1,4 @@
#!/usr/bin/env python #!/usr/bin/env python
from __future__ import print_function
import json import json
import sys import sys
@ -8,11 +7,6 @@ from argparse import ArgumentParser
import requests import requests
try:
raw_input
except NameError: # Python 3
raw_input = input
def _mkurl(template, kws): def _mkurl(template, kws):
for key in 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) print("The following user IDs will be kicked from %s" % room_name)
for uid in kick_list: for uid in kick_list:
print(uid) print(uid)
doit = raw_input("Continue? [Y]es\n") doit = input("Continue? [Y]es\n")
if len(doit) > 0 and doit.lower() == "y": if len(doit) > 0 and doit.lower() == "y":
print("Kicking members...") print("Kicking members...")
# encode them all # encode them all

View File

@ -1,7 +1,5 @@
#! /usr/bin/python #! /usr/bin/python
from __future__ import print_function
import argparse import argparse
import ast import ast
import os import os

View File

@ -1,7 +1,5 @@
#!/usr/bin/env python2 #!/usr/bin/env python2
from __future__ import print_function
import sys import sys
import pymacaroons import pymacaroons

View File

@ -15,8 +15,6 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
from __future__ import print_function
import argparse import argparse
import base64 import base64
import json import json

View File

@ -1,5 +1,3 @@
from __future__ import print_function
import sqlite3 import sqlite3
import sys import sys

View File

@ -32,8 +32,6 @@ To use, pipe the above into::
PYTHON_PATH=. ./scripts/move_remote_media_to_new_store.py <source repo> <dest repo> PYTHON_PATH=. ./scripts/move_remote_media_to_new_store.py <source repo> <dest repo>
""" """
from __future__ import print_function
import argparse import argparse
import logging import logging
import os import os

View File

@ -14,8 +14,6 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
from __future__ import print_function
from synapse._scripts.register_new_matrix_user import main from synapse._scripts.register_new_matrix_user import main
if __name__ == "__main__": if __name__ == "__main__":

View File

@ -14,8 +14,6 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
from __future__ import print_function
import argparse import argparse
import getpass import getpass
import hashlib import hashlib

View File

@ -15,8 +15,6 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
from __future__ import print_function
import gc import gc
import logging import logging
import math import math

View File

@ -14,7 +14,6 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
from __future__ import print_function
# This file can't be called email.py because if it is, we cannot: # This file can't be called email.py because if it is, we cannot:
import email.utils import email.utils

View File

@ -13,8 +13,6 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
from __future__ import division
import sys import sys
from ._base import Config from ._base import Config

View File

@ -13,8 +13,6 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
from __future__ import division
import itertools import itertools
import logging import logging
import threading import threading

View File

@ -13,8 +13,6 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
from __future__ import print_function
import functools import functools
import sys import sys
from typing import Any, Callable, List from typing import Any, Callable, List