From 1e87a4b68c5b29af1ac41cfbdc259f92aacb4dc5 Mon Sep 17 00:00:00 2001 From: rht Date: Wed, 27 Sep 2017 10:41:10 +0200 Subject: [PATCH] zerver/tests: Remove absolute_import. --- zerver/tests/test_alert_words.py | 1 - zerver/tests/test_attachments.py | 1 - zerver/tests/test_bots.py | 1 - zerver/tests/test_bugdown.py | 1 - zerver/tests/test_compatibility.py | 1 - zerver/tests/test_custom_profile_data.py | 1 - zerver/tests/test_docs.py | 1 - zerver/tests/test_email_change.py | 1 - zerver/tests/test_email_mirror.py | 1 - zerver/tests/test_events.py | 1 - zerver/tests/test_export.py | 1 - zerver/tests/test_external.py | 1 - zerver/tests/test_home.py | 1 - zerver/tests/test_hotspots.py | 1 - zerver/tests/test_i18n.py | 1 - zerver/tests/test_link_embed.py | 1 - zerver/tests/test_logging_handlers.py | 1 - zerver/tests/test_management_commands.py | 1 - zerver/tests/test_messages.py | 1 - zerver/tests/test_middleware.py | 1 - zerver/tests/test_muting.py | 1 - zerver/tests/test_narrow.py | 1 - zerver/tests/test_notifications.py | 1 - zerver/tests/test_outgoing_webhook_interfaces.py | 1 - zerver/tests/test_outgoing_webhook_system.py | 1 - zerver/tests/test_presence.py | 1 - zerver/tests/test_push_notifications.py | 1 - zerver/tests/test_queue_worker.py | 1 - zerver/tests/test_reactions.py | 1 - zerver/tests/test_realm.py | 1 - zerver/tests/test_realm_domains.py | 1 - zerver/tests/test_realm_emoji.py | 1 - zerver/tests/test_realm_filters.py | 1 - zerver/tests/test_report.py | 1 - zerver/tests/test_retention.py | 1 - zerver/tests/test_service_bot_system.py | 1 - zerver/tests/test_sessions.py | 1 - zerver/tests/test_settings.py | 1 - zerver/tests/test_signup.py | 1 - zerver/tests/test_soft_deactivation.py | 1 - zerver/tests/test_subs.py | 1 - zerver/tests/test_templates.py | 1 - zerver/tests/test_timestamp.py | 1 - zerver/tests/test_tornado.py | 1 - zerver/tests/test_tutorial.py | 1 - zerver/tests/test_typing.py | 1 - zerver/tests/test_unread.py | 1 - zerver/tests/test_upload.py | 1 - zerver/tests/test_urls.py | 1 - zerver/tests/test_users.py | 1 - zerver/tests/test_zephyr.py | 1 - 51 files changed, 51 deletions(-) diff --git a/zerver/tests/test_alert_words.py b/zerver/tests/test_alert_words.py index 7f1f471de1..1ce0b63376 100644 --- a/zerver/tests/test_alert_words.py +++ b/zerver/tests/test_alert_words.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import from __future__ import print_function from zerver.lib.alert_words import ( diff --git a/zerver/tests/test_attachments.py b/zerver/tests/test_attachments.py index a1a3bf2eed..619518c3ab 100644 --- a/zerver/tests/test_attachments.py +++ b/zerver/tests/test_attachments.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import from __future__ import print_function import mock diff --git a/zerver/tests/test_bots.py b/zerver/tests/test_bots.py index dec2beee65..9db71d36b7 100644 --- a/zerver/tests/test_bots.py +++ b/zerver/tests/test_bots.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import from __future__ import print_function import filecmp diff --git a/zerver/tests/test_bugdown.py b/zerver/tests/test_bugdown.py index 92772b62b7..ed79a5d117 100644 --- a/zerver/tests/test_bugdown.py +++ b/zerver/tests/test_bugdown.py @@ -1,6 +1,5 @@ # -*- coding: utf-8 -*- from __future__ import print_function -from __future__ import absolute_import from django.conf import settings from django.test import TestCase, override_settings diff --git a/zerver/tests/test_compatibility.py b/zerver/tests/test_compatibility.py index 72e5a3f98c..2456b2938c 100644 --- a/zerver/tests/test_compatibility.py +++ b/zerver/tests/test_compatibility.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import from __future__ import print_function from zerver.lib.test_classes import ZulipTestCase diff --git a/zerver/tests/test_custom_profile_data.py b/zerver/tests/test_custom_profile_data.py index 1d48470ff0..cd3fda1237 100644 --- a/zerver/tests/test_custom_profile_data.py +++ b/zerver/tests/test_custom_profile_data.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import from typing import Union, List, Dict, Text, Any from mock import patch diff --git a/zerver/tests/test_docs.py b/zerver/tests/test_docs.py index 69b875005a..d2fd3553b8 100644 --- a/zerver/tests/test_docs.py +++ b/zerver/tests/test_docs.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import import os import subprocess diff --git a/zerver/tests/test_email_change.py b/zerver/tests/test_email_change.py index 4e4ffe1cb4..870a40b4c2 100644 --- a/zerver/tests/test_email_change.py +++ b/zerver/tests/test_email_change.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import import datetime from typing import Any diff --git a/zerver/tests/test_email_mirror.py b/zerver/tests/test_email_mirror.py index 83a48fca9f..a73d0346de 100644 --- a/zerver/tests/test_email_mirror.py +++ b/zerver/tests/test_email_mirror.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import import subprocess diff --git a/zerver/tests/test_events.py b/zerver/tests/test_events.py index 8c2030d091..8d25a4253b 100644 --- a/zerver/tests/test_events.py +++ b/zerver/tests/test_events.py @@ -1,7 +1,6 @@ # -*- coding: utf-8 -*- # See http://zulip.readthedocs.io/en/latest/events-system.html for # high-level documentation on how this system works. -from __future__ import absolute_import from __future__ import print_function from typing import Any, Callable, Dict, List, Optional, Union, Text, Tuple import os diff --git a/zerver/tests/test_export.py b/zerver/tests/test_export.py index 2330b6e2db..f83cc502ef 100644 --- a/zerver/tests/test_export.py +++ b/zerver/tests/test_export.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import from __future__ import print_function from django.conf import settings diff --git a/zerver/tests/test_external.py b/zerver/tests/test_external.py index 6ff438975d..7cd4b8fba9 100644 --- a/zerver/tests/test_external.py +++ b/zerver/tests/test_external.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import from django.conf import settings from django.core.exceptions import ValidationError from django.http import HttpResponse diff --git a/zerver/tests/test_home.py b/zerver/tests/test_home.py index bef03414f3..ef9103294e 100644 --- a/zerver/tests/test_home.py +++ b/zerver/tests/test_home.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import from __future__ import print_function import datetime diff --git a/zerver/tests/test_hotspots.py b/zerver/tests/test_hotspots.py index 90d7074a70..aba71457be 100644 --- a/zerver/tests/test_hotspots.py +++ b/zerver/tests/test_hotspots.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import from zerver.lib.actions import do_mark_hotspot_as_read, do_create_user from zerver.lib.hotspots import ALL_HOTSPOTS, get_next_hotspots diff --git a/zerver/tests/test_i18n.py b/zerver/tests/test_i18n.py index c948eac0a2..36b78dcac3 100644 --- a/zerver/tests/test_i18n.py +++ b/zerver/tests/test_i18n.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import from typing import Any diff --git a/zerver/tests/test_link_embed.py b/zerver/tests/test_link_embed.py index 0ed4f0348b..f1346877a9 100644 --- a/zerver/tests/test_link_embed.py +++ b/zerver/tests/test_link_embed.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import from __future__ import print_function import mock diff --git a/zerver/tests/test_logging_handlers.py b/zerver/tests/test_logging_handlers.py index 4d006adb82..b29eea7af9 100644 --- a/zerver/tests/test_logging_handlers.py +++ b/zerver/tests/test_logging_handlers.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import import logging import sys diff --git a/zerver/tests/test_management_commands.py b/zerver/tests/test_management_commands.py index d806670093..81864979a2 100644 --- a/zerver/tests/test_management_commands.py +++ b/zerver/tests/test_management_commands.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import, print_function import os import glob diff --git a/zerver/tests/test_messages.py b/zerver/tests/test_messages.py index dbc30fb100..8be5fad949 100644 --- a/zerver/tests/test_messages.py +++ b/zerver/tests/test_messages.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import from django.db.models import Q, Max from django.conf import settings from django.http import HttpResponse diff --git a/zerver/tests/test_middleware.py b/zerver/tests/test_middleware.py index ecd1af8580..99660bf972 100644 --- a/zerver/tests/test_middleware.py +++ b/zerver/tests/test_middleware.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import from __future__ import print_function from django.test import TestCase diff --git a/zerver/tests/test_muting.py b/zerver/tests/test_muting.py index 472ddfd434..4dda756bf8 100644 --- a/zerver/tests/test_muting.py +++ b/zerver/tests/test_muting.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import from __future__ import print_function import ujson diff --git a/zerver/tests/test_narrow.py b/zerver/tests/test_narrow.py index 7cb0900236..d1321bb23b 100644 --- a/zerver/tests/test_narrow.py +++ b/zerver/tests/test_narrow.py @@ -1,7 +1,6 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import from __future__ import print_function from django.db import connection from django.test import override_settings diff --git a/zerver/tests/test_notifications.py b/zerver/tests/test_notifications.py index a42a5b9d19..19d8fd24d1 100644 --- a/zerver/tests/test_notifications.py +++ b/zerver/tests/test_notifications.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import from __future__ import print_function import os diff --git a/zerver/tests/test_outgoing_webhook_interfaces.py b/zerver/tests/test_outgoing_webhook_interfaces.py index 680bbfd9df..533f46fde5 100644 --- a/zerver/tests/test_outgoing_webhook_interfaces.py +++ b/zerver/tests/test_outgoing_webhook_interfaces.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import from __future__ import print_function from typing import Any diff --git a/zerver/tests/test_outgoing_webhook_system.py b/zerver/tests/test_outgoing_webhook_system.py index 97f9fa43fb..d1f366a71f 100644 --- a/zerver/tests/test_outgoing_webhook_system.py +++ b/zerver/tests/test_outgoing_webhook_system.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import from __future__ import print_function import logging diff --git a/zerver/tests/test_presence.py b/zerver/tests/test_presence.py index 7c44825164..877170cbf6 100644 --- a/zerver/tests/test_presence.py +++ b/zerver/tests/test_presence.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import from __future__ import print_function from django.http import HttpResponse diff --git a/zerver/tests/test_push_notifications.py b/zerver/tests/test_push_notifications.py index 77f27eac3d..ec134531ac 100644 --- a/zerver/tests/test_push_notifications.py +++ b/zerver/tests/test_push_notifications.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import from __future__ import print_function import itertools diff --git a/zerver/tests/test_queue_worker.py b/zerver/tests/test_queue_worker.py index 14b00400a9..56eab443e1 100644 --- a/zerver/tests/test_queue_worker.py +++ b/zerver/tests/test_queue_worker.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import from __future__ import print_function import os diff --git a/zerver/tests/test_reactions.py b/zerver/tests/test_reactions.py index 67a5dbfd6a..28fcfd075a 100644 --- a/zerver/tests/test_reactions.py +++ b/zerver/tests/test_reactions.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import import ujson from typing import Any, Mapping, List diff --git a/zerver/tests/test_realm.py b/zerver/tests/test_realm.py index c176f1c2bb..0bf97a40ff 100644 --- a/zerver/tests/test_realm.py +++ b/zerver/tests/test_realm.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import from __future__ import print_function import datetime diff --git a/zerver/tests/test_realm_domains.py b/zerver/tests/test_realm_domains.py index f183e4820e..e96581763e 100644 --- a/zerver/tests/test_realm_domains.py +++ b/zerver/tests/test_realm_domains.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import from django.core.exceptions import ValidationError from django.db.utils import IntegrityError diff --git a/zerver/tests/test_realm_emoji.py b/zerver/tests/test_realm_emoji.py index c8cf36023c..aa1ddd0d60 100644 --- a/zerver/tests/test_realm_emoji.py +++ b/zerver/tests/test_realm_emoji.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import from zerver.lib.actions import get_realm, check_add_realm_emoji from zerver.lib.test_classes import ZulipTestCase diff --git a/zerver/tests/test_realm_filters.py b/zerver/tests/test_realm_filters.py index 0cc03f815c..3ccd11560c 100644 --- a/zerver/tests/test_realm_filters.py +++ b/zerver/tests/test_realm_filters.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import from zerver.lib.actions import get_realm, do_add_realm_filter from zerver.lib.test_classes import ZulipTestCase diff --git a/zerver/tests/test_report.py b/zerver/tests/test_report.py index 1ebe4fde9b..7374d69a38 100644 --- a/zerver/tests/test_report.py +++ b/zerver/tests/test_report.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import from __future__ import print_function from typing import Any, Callable, Dict, Iterable, List, Tuple diff --git a/zerver/tests/test_retention.py b/zerver/tests/test_retention.py index 97514f283f..5805a93529 100644 --- a/zerver/tests/test_retention.py +++ b/zerver/tests/test_retention.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import import types from datetime import datetime, timedelta diff --git a/zerver/tests/test_service_bot_system.py b/zerver/tests/test_service_bot_system.py index b129c11b6b..38f061f711 100644 --- a/zerver/tests/test_service_bot_system.py +++ b/zerver/tests/test_service_bot_system.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import from __future__ import print_function import mock diff --git a/zerver/tests/test_sessions.py b/zerver/tests/test_sessions.py index 8d511f7f91..e0fdde48d5 100644 --- a/zerver/tests/test_sessions.py +++ b/zerver/tests/test_sessions.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import from typing import Any, Callable, Text from zerver.lib.sessions import ( diff --git a/zerver/tests/test_settings.py b/zerver/tests/test_settings.py index 6d563500e5..cd8b918747 100644 --- a/zerver/tests/test_settings.py +++ b/zerver/tests/test_settings.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import from __future__ import print_function import ujson diff --git a/zerver/tests/test_signup.py b/zerver/tests/test_signup.py index db4bdf1ec1..79178de523 100644 --- a/zerver/tests/test_signup.py +++ b/zerver/tests/test_signup.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import import datetime from django.conf import settings from django.contrib.contenttypes.models import ContentType diff --git a/zerver/tests/test_soft_deactivation.py b/zerver/tests/test_soft_deactivation.py index 37f3b1c484..17959e8b66 100644 --- a/zerver/tests/test_soft_deactivation.py +++ b/zerver/tests/test_soft_deactivation.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import from django.utils.timezone import now as timezone_now diff --git a/zerver/tests/test_subs.py b/zerver/tests/test_subs.py index 03700e1fbb..205804d9d7 100644 --- a/zerver/tests/test_subs.py +++ b/zerver/tests/test_subs.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import from typing import Any, Dict, List, Mapping, Optional, Sequence, Set, Text diff --git a/zerver/tests/test_templates.py b/zerver/tests/test_templates.py index 06ed6dab1f..e28c243552 100644 --- a/zerver/tests/test_templates.py +++ b/zerver/tests/test_templates.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import import re from typing import Any, Dict, Iterable diff --git a/zerver/tests/test_timestamp.py b/zerver/tests/test_timestamp.py index 9a3152e01b..f00e69a246 100644 --- a/zerver/tests/test_timestamp.py +++ b/zerver/tests/test_timestamp.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import from django.utils.timezone import utc as timezone_utc diff --git a/zerver/tests/test_tornado.py b/zerver/tests/test_tornado.py index 8073bdb424..86b780549b 100644 --- a/zerver/tests/test_tornado.py +++ b/zerver/tests/test_tornado.py @@ -5,7 +5,6 @@ and Django test systems. It require to use decorator '@gen.coroutine' for each test case method( see documentation: http://www.tornadoweb.org/en/stable/testing.html). It requires implementation of 'get_app' method to initialize tornado application and launch it. """ -from __future__ import absolute_import from __future__ import print_function diff --git a/zerver/tests/test_tutorial.py b/zerver/tests/test_tutorial.py index fe841ac39c..424e01272f 100644 --- a/zerver/tests/test_tutorial.py +++ b/zerver/tests/test_tutorial.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import from __future__ import print_function from typing import Any, Dict diff --git a/zerver/tests/test_typing.py b/zerver/tests/test_typing.py index 3553d511a1..8f58c632cc 100644 --- a/zerver/tests/test_typing.py +++ b/zerver/tests/test_typing.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import import ujson from typing import Any, Mapping, List diff --git a/zerver/tests/test_unread.py b/zerver/tests/test_unread.py index b5758054fd..22cbd8b98d 100644 --- a/zerver/tests/test_unread.py +++ b/zerver/tests/test_unread.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*-AA -from __future__ import absolute_import from typing import Any, Dict, List, Mapping, Text diff --git a/zerver/tests/test_upload.py b/zerver/tests/test_upload.py index a2785fd631..e455de95a0 100644 --- a/zerver/tests/test_upload.py +++ b/zerver/tests/test_upload.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import from django.conf import settings from django.test import TestCase, override_settings from unittest import skip diff --git a/zerver/tests/test_urls.py b/zerver/tests/test_urls.py index 24adcf53f2..9a4a484f8f 100644 --- a/zerver/tests/test_urls.py +++ b/zerver/tests/test_urls.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import from __future__ import print_function import importlib diff --git a/zerver/tests/test_users.py b/zerver/tests/test_users.py index 83c112b006..0832784611 100644 --- a/zerver/tests/test_users.py +++ b/zerver/tests/test_users.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import from __future__ import print_function from typing import (Any, Dict, Iterable, List, Mapping, diff --git a/zerver/tests/test_zephyr.py b/zerver/tests/test_zephyr.py index 8b733208c8..6ea7e9df76 100644 --- a/zerver/tests/test_zephyr.py +++ b/zerver/tests/test_zephyr.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import from __future__ import print_function import ujson