From 4600ce59a3814961f8210e43312940bde7e3bd44 Mon Sep 17 00:00:00 2001 From: rht Date: Fri, 3 Apr 2020 05:17:01 -0400 Subject: [PATCH] Remove all remaining from __future__ imports. --- tools/custom_check.py | 3 --- tools/lint | 2 -- tools/pep8.py | 3 --- tools/release-packages | 1 - tools/review | 1 - tools/run-mypy | 3 --- zulip/setup.py | 1 - zulip/tests/test_default_arguments.py | 2 -- zulip/zulip/__init__.py | 3 --- zulip_bots/setup.py | 2 -- zulip_bots/zulip_bots/provision.py | 2 -- zulip_botserver/setup.py | 2 -- 12 files changed, 25 deletions(-) diff --git a/tools/custom_check.py b/tools/custom_check.py index 80c8020..809ee02 100644 --- a/tools/custom_check.py +++ b/tools/custom_check.py @@ -1,6 +1,3 @@ -from __future__ import print_function -from __future__ import absolute_import - from typing import Any, Dict, List, Tuple from zulint.custom_rules import RuleList diff --git a/tools/lint b/tools/lint index 913c841..38bd50d 100755 --- a/tools/lint +++ b/tools/lint @@ -1,7 +1,5 @@ #! /usr/bin/env python3 -from __future__ import print_function -from __future__ import absolute_import import argparse from zulint.command import add_default_linter_arguments, LinterConfig diff --git a/tools/pep8.py b/tools/pep8.py index 6a33647..75f0a4e 100644 --- a/tools/pep8.py +++ b/tools/pep8.py @@ -1,9 +1,6 @@ # This file has been copied and modified from the Zulip server repository # Original path: zulip/tools/linter_lib/pep8.py -from __future__ import print_function -from __future__ import absolute_import - import subprocess import sys diff --git a/tools/release-packages b/tools/release-packages index 67503ea..6556e2b 100755 --- a/tools/release-packages +++ b/tools/release-packages @@ -1,6 +1,5 @@ #!/usr/bin/env python3 -from __future__ import print_function from contextlib import contextmanager import os import argparse diff --git a/tools/review b/tools/review index d90ef3f..8201945 100755 --- a/tools/review +++ b/tools/review @@ -1,6 +1,5 @@ #!/usr/bin/env python3 -from __future__ import print_function import subprocess import sys diff --git a/tools/run-mypy b/tools/run-mypy index 268c35f..c118b3e 100755 --- a/tools/run-mypy +++ b/tools/run-mypy @@ -1,8 +1,5 @@ #!/usr/bin/env python3 -from __future__ import absolute_import -from __future__ import print_function - import os import sys import argparse diff --git a/zulip/setup.py b/zulip/setup.py index 35e5233..659b541 100755 --- a/zulip/setup.py +++ b/zulip/setup.py @@ -1,7 +1,6 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -from __future__ import print_function if False: from typing import Any, Dict, Generator, List, Tuple diff --git a/zulip/tests/test_default_arguments.py b/zulip/tests/test_default_arguments.py index 0b983a8..baedba3 100755 --- a/zulip/tests/test_default_arguments.py +++ b/zulip/tests/test_default_arguments.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import - import argparse import os import six diff --git a/zulip/zulip/__init__.py b/zulip/zulip/__init__.py index e2762eb..2357f10 100644 --- a/zulip/zulip/__init__.py +++ b/zulip/zulip/__init__.py @@ -1,8 +1,5 @@ # -*- coding: utf-8 -*- -from __future__ import print_function -from __future__ import absolute_import -from __future__ import division import json import requests import time diff --git a/zulip_bots/setup.py b/zulip_bots/setup.py index 51532db..f1e0c96 100644 --- a/zulip_bots/setup.py +++ b/zulip_bots/setup.py @@ -1,8 +1,6 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -from __future__ import print_function - import os import sys import glob diff --git a/zulip_bots/zulip_bots/provision.py b/zulip_bots/zulip_bots/provision.py index 1d14422..2112e00 100755 --- a/zulip_bots/zulip_bots/provision.py +++ b/zulip_bots/zulip_bots/provision.py @@ -1,7 +1,5 @@ #!/usr/bin/env python3 -from __future__ import absolute_import - import argparse import logging import os diff --git a/zulip_botserver/setup.py b/zulip_botserver/setup.py index f530329..05c9784 100644 --- a/zulip_botserver/setup.py +++ b/zulip_botserver/setup.py @@ -1,8 +1,6 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -from __future__ import print_function - import sys if False: from typing import Any, Dict, Optional