flake8-tidy-imports (#317)

.flake8

@@ -27,4 +27,9 @@ ignore=
     SFS201
     # https://pypi.org/project/flake8-future-import/
     FI1
-exclude=migrations/versions
+banned-modules=
+    flask.ext = use flask_
+    builtins = don't use
+    typing.Text = use str
+    mock = use unittest.mock
+exclude=migrations/versions

requirements/lint.txt

@@ -11,6 +11,7 @@ flake8-future-import==0.4.6
 flake8-no-u-prefixed-strings==0.2
 flake8-simplify==0.14.2
 flake8-sfs==0.0.3
+flake8-tidy-imports==4.6.0
 mccabe==0.6.1
 regex==2020.9.27
 pathspec==0.8.0

requirements/test.txt

@@ -4,7 +4,6 @@ funcsigs==1.0.2
 freezegun==1.1.0
 hypothesis==6.30.0
 iniconfig==1.1.1
-mock==1.3.0
 mockredispy==2.9.3
 more-itertools==5.0.0
 packaging==20.9

tests/api/test_files.py

@@ -3,8 +3,8 @@
 import sys
 from datetime import datetime
 from hashlib import md5
+from unittest import mock
 
-import mock
 import pytest
 
 from inbox.models import Block, Part

tests/api/test_folders.py

@@ -1,6 +1,7 @@
 # flake8: noqa: F401, F811
+from unittest import mock
+
 import gevent
-import mock
 
 from inbox.util.testutils import mock_imapclient  # noqa
 

tests/api/test_invalid_account.py

@@ -1,7 +1,7 @@
 import datetime
 import json
+from unittest import mock
 
-import mock
 import pytest
 import requests
 

tests/api/test_messages.py

@@ -1,6 +1,6 @@
 import json
+from unittest import mock
 
-import mock
 import pytest
 
 from inbox.api.ns_api import API_VERSIONS

tests/api/test_searching.py

@@ -1,7 +1,7 @@
 import datetime
 import json
+from unittest import mock
 
-import mock
 import pytest
 import requests
 from pytest import fixture

tests/events/test_google_events.py

@@ -1,8 +1,8 @@
 import json
+from unittest import mock
 
 import arrow
 import gevent
-import mock
 import pytest
 import requests
 

tests/general/test_message_parsing.py

@@ -2,10 +2,10 @@
 """Sanity-check our construction of a Message object from raw synced data."""
 import datetime
 import sys
+from unittest.mock import patch
 
 import pytest
 from flanker import mime
-from mock import patch
 
 from inbox.models import Block, Message
 from inbox.util.addr import parse_mimepart_address_header

tests/imap/test_actions.py

@@ -1,6 +1,7 @@
 # flake8: noqa: F401, F811
+from unittest import mock
+
 import gevent
-import mock
 import pytest
 from flanker import mime
 

tests/imap/test_crispin_client.py

@@ -5,9 +5,9 @@
 by some providers (Gmail, Fastmail).
 """
 from datetime import datetime
+from unittest import mock
 
 import imapclient
-import mock
 import pytest
 
 from inbox.crispin import (

tests/imap/test_full_imap_enabled.py

@@ -1,5 +1,6 @@
+from unittest.mock import Mock
+
 from imapclient import IMAPClient
-from mock import Mock
 
 from inbox.auth.generic import GenericAuthHandler
 from inbox.basicauth import UserRecoverableConfigError

tests/imap/test_pooling.py

@@ -1,9 +1,9 @@
 import imaplib
 import socket
 import ssl
+from unittest import mock
 
 import gevent
-import mock
 import pytest
 
 from inbox.crispin import CrispinConnectionPool

tests/imap/test_smtp.py

@@ -1,6 +1,6 @@
 import smtplib
+from unittest import mock
 
-import mock
 import pytest
 
 from inbox.logging import get_logger

tests/scheduling/test_sync_start_logic.py

@@ -1,7 +1,7 @@
 import json
 import platform
+from unittest import mock
 
-import mock
 import pytest
 
 from inbox.ignition import engine_manager

tests/test_instrumentation.py

@@ -1,6 +1,5 @@
 import time
-
-import mock
+from unittest import mock
 
 from inbox.instrumentation import GreenletTracer
 

tests/util/base.py

@@ -2,8 +2,8 @@
 import os
 import uuid
 from datetime import datetime, timedelta
+from unittest import mock
 
-import mock
 from flanker import mime
 from mockredis import mock_strict_redis_client
 from pytest import fixture

tests/webhooks/test_gpush_calendar_notifications.py

@@ -1,7 +1,7 @@
 from datetime import datetime, timedelta
+from unittest import mock
 
 import limitlion
-import mock
 import pytest
 from gevent import sleep