diff --git a/zerver/context_processors.py b/zerver/context_processors.py index 2240b53c5d..2d3d2a2fcd 100644 --- a/zerver/context_processors.py +++ b/zerver/context_processors.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import from typing import Any, Dict, List, Optional from django.http import HttpRequest diff --git a/zerver/decorator.py b/zerver/decorator.py index b48506597d..bbe7c669f5 100644 --- a/zerver/decorator.py +++ b/zerver/decorator.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import from django.utils.translation import ugettext as _ from django.http import HttpResponseRedirect, HttpResponse diff --git a/zerver/filters.py b/zerver/filters.py index 2c9eef7863..4ed40b2891 100644 --- a/zerver/filters.py +++ b/zerver/filters.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import from typing import Any, Dict diff --git a/zerver/forms.py b/zerver/forms.py index 1a2e2b3837..fe96c744d1 100644 --- a/zerver/forms.py +++ b/zerver/forms.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import from django import forms from django.conf import settings diff --git a/zerver/logging_handlers.py b/zerver/logging_handlers.py index c9f3181db3..2bce3fd803 100644 --- a/zerver/logging_handlers.py +++ b/zerver/logging_handlers.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import from django.conf import settings from typing import Any, Dict, Optional diff --git a/zerver/middleware.py b/zerver/middleware.py index ca7cadbce9..7b54606e93 100644 --- a/zerver/middleware.py +++ b/zerver/middleware.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import from six import binary_type from typing import Any, AnyStr, Callable, Dict, Iterable, List, MutableMapping, Optional, Text diff --git a/zerver/models.py b/zerver/models.py index 96572cc915..239e78753b 100644 --- a/zerver/models.py +++ b/zerver/models.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import from typing import Any, DefaultDict, Dict, List, Set, Tuple, TypeVar, Text, \ Union, Optional, Sequence, AbstractSet, Pattern, AnyStr, Callable, Iterable from typing.re import Match diff --git a/zerver/signals.py b/zerver/signals.py index 54ca9f2bb2..41a1ad18fe 100644 --- a/zerver/signals.py +++ b/zerver/signals.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import from django.dispatch import receiver from django.contrib.auth.signals import user_logged_in diff --git a/zerver/storage.py b/zerver/storage.py index bc546b1011..5b3604c19f 100644 --- a/zerver/storage.py +++ b/zerver/storage.py @@ -1,5 +1,4 @@ # Useful reading is https://zulip.readthedocs.io/en/latest/front-end-build-process.html -from __future__ import absolute_import import os import shutil diff --git a/zerver/templatetags/minified_js.py b/zerver/templatetags/minified_js.py index b8e342ecc6..afc6443dc5 100644 --- a/zerver/templatetags/minified_js.py +++ b/zerver/templatetags/minified_js.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import from typing import Any, Dict from django.template import Node, Library, TemplateSyntaxError diff --git a/zerver/views/email_log.py b/zerver/views/email_log.py index fc1f618685..d03ad86098 100755 --- a/zerver/views/email_log.py +++ b/zerver/views/email_log.py @@ -1,5 +1,4 @@ #!/usr/bin/env python3 -from __future__ import absolute_import from __future__ import print_function from django.conf import settings