Merge pull request #10094 from internetarchive/isort/tests-mocks-utils

isort tests/mocks/utils

openlibrary/conftest.py

@@ -7,13 +7,12 @@
 from infogami.infobase.tests.pytest_wildcard import Wildcard
 from infogami.utils import template
 from infogami.utils.view import render_template as infobase_render_template
-from openlibrary.i18n import gettext
 from openlibrary.core import helpers
-
+from openlibrary.i18n import gettext
+from openlibrary.mocks.mock_ia import mock_ia  # noqa: F401 side effects may be needed
 from openlibrary.mocks.mock_infobase import (
     mock_site,  # noqa: F401 side effects may be needed
 )
-from openlibrary.mocks.mock_ia import mock_ia  # noqa: F401 side effects may be needed
 from openlibrary.mocks.mock_memcache import (
     mock_memcache,  # noqa: F401 side effects may be needed
 )

openlibrary/mocks/mock_ia.py

@@ -2,6 +2,7 @@
 """
 
 import pytest
+
 from openlibrary.core import ia
 
 

openlibrary/mocks/mock_infobase.py

@@ -5,17 +5,17 @@
 import itertools
 import json
 import re
+from datetime import datetime
+
 import pytest
 import web
 
-from datetime import datetime
-
-from infogami.infobase import client, common, account, config as infobase_config
 from infogami import config
+from infogami.infobase import account, client, common
+from infogami.infobase import config as infobase_config
 from openlibrary.plugins.upstream.models import Changeset
 from openlibrary.plugins.upstream.utils import safeget
 
-
 key_patterns = {
     'work': '/works/OL%dW',
     'edition': '/books/OL%dM',

openlibrary/mocks/mock_ol.py

@@ -1,6 +1,8 @@
-import pytest
 import re
+
+import pytest
 import web
+
 from infogami import config
 from infogami.utils import delegate
 
@@ -9,7 +11,7 @@
 except ImportError:  # older versions of web.py
     from web import AppBrowser
 
-from openlibrary.mocks.mock_infobase import mock_site, MockConnection
+from openlibrary.mocks.mock_infobase import MockConnection, mock_site
 from openlibrary.plugins import ol_infobase
 
 

openlibrary/mocks/tests/test_mock_infobase.py

@@ -1,4 +1,5 @@
 import datetime
+
 import web
 
 

openlibrary/mocks/tests/test_mock_memcache.py

@@ -1,6 +1,7 @@
-from .. import mock_memcache
 import memcache
 
+from .. import mock_memcache
+
 
 class Test_mock_memcache:
     def test_set(self):

openlibrary/tests/accounts/test_models.py

@@ -1,7 +1,9 @@
-from openlibrary.accounts import model, InternetArchiveAccount, OpenLibraryAccount
-from requests.models import Response
 from unittest import mock
 
+from requests.models import Response
+
+from openlibrary.accounts import InternetArchiveAccount, OpenLibraryAccount, model
+
 
 def get_username(account):
     return account and account.value

openlibrary/tests/catalog/test_get_ia.py

@@ -1,10 +1,11 @@
-import pytest
 from pathlib import Path
+
+import pytest
+
 from openlibrary.catalog import get_ia
-from openlibrary.core import ia
+from openlibrary.catalog.marc.marc_binary import BadLength, BadMARC, MarcBinary
 from openlibrary.catalog.marc.marc_xml import MarcXml
-from openlibrary.catalog.marc.marc_binary import MarcBinary, BadLength, BadMARC
-
+from openlibrary.core import ia
 
 TEST_DATA = Path(__file__).parents[2] / 'catalog' / 'marc' / 'tests' / 'test_data'
 

openlibrary/tests/catalog/test_utils.py

@@ -1,6 +1,7 @@
+from datetime import datetime, timedelta
+
 import pytest
 
-from datetime import datetime, timedelta
 from openlibrary.catalog.utils import (
     author_dates_match,
     flip_name,

openlibrary/tests/core/conftest.py

@@ -1,4 +1,5 @@
 import os
+
 import pytest
 
 

openlibrary/tests/core/lists/test_model.py

@@ -1,5 +1,5 @@
-from openlibrary.mocks.mock_infobase import MockSite
 import openlibrary.core.lists.model as list_model
+from openlibrary.mocks.mock_infobase import MockSite
 
 
 class TestList:

openlibrary/tests/core/test_connections.py

@@ -1,7 +1,8 @@
 # This will be moved to core soon.
-from openlibrary.plugins.openlibrary import connection as connections
 import json
 
+from openlibrary.plugins.openlibrary import connection as connections
+
 
 class MockConnection:
     def __init__(self):

openlibrary/tests/core/test_db.py

@@ -1,8 +1,9 @@
 import web
-from openlibrary.core.db import get_db
+
+from openlibrary.core.booknotes import Booknotes
 from openlibrary.core.bookshelves import Bookshelves
 from openlibrary.core.bookshelves_events import BookshelvesEvents
-from openlibrary.core.booknotes import Booknotes
+from openlibrary.core.db import get_db
 from openlibrary.core.edits import CommunityEditsQueue
 from openlibrary.core.observations import Observations
 from openlibrary.core.ratings import Ratings

openlibrary/tests/core/test_fulltext.py

@@ -1,6 +1,8 @@
 from json.decoder import JSONDecodeError
 from unittest.mock import Mock, patch
+
 import requests
+
 from infogami import config
 from openlibrary.core import fulltext
 

openlibrary/tests/core/test_helpers.py

@@ -1,4 +1,5 @@
 import web
+
 from openlibrary.core import helpers as h
 from openlibrary.mocks.mock_infobase import MockSite
 

openlibrary/tests/core/test_i18n.py

@@ -1,8 +1,8 @@
 import web
-from openlibrary.mocks.mock_infobase import MockSite
 
 # The i18n module should be moved to core.
 from openlibrary import i18n
+from openlibrary.mocks.mock_infobase import MockSite
 
 
 class MockTranslations(dict):

openlibrary/tests/core/test_imports.py

@@ -1,11 +1,11 @@
-import pytest
 from typing import Final
+
+import pytest
 import web
 
 from openlibrary.core.db import get_db
 from openlibrary.core.imports import Batch, ImportItem
 
-
 IMPORT_ITEM_DDL: Final = """
 CREATE TABLE import_item (
     id serial primary key,

openlibrary/tests/core/test_models.py

@@ -1,7 +1,7 @@
-from openlibrary.core import models
-
 import pytest
 
+from openlibrary.core import models
+
 
 class MockSite:
     def get(self, key):
@@ -154,6 +154,7 @@ def test_resolve_redirect_chain(self, monkeypatch):
         work4 = {"key": work4_key, "type": type_work}
 
         import web
+
         from openlibrary.mocks import mock_infobase
 
         site = mock_infobase.MockSite()

openlibrary/tests/core/test_processors.py

@@ -1,7 +1,8 @@
-from openlibrary.core.processors import readableurls as processors
-from infogami.infobase import client, common
 import web
 
+from infogami.infobase import client, common
+from openlibrary.core.processors import readableurls as processors
+
 
 class MockSite:
     def __init__(self):

openlibrary/tests/core/test_processors_invalidation.py

@@ -1,6 +1,7 @@
-import web
 import datetime
 
+import web
+
 from infogami.infobase import client
 from openlibrary.core.processors import invalidation
 from openlibrary.mocks.mock_infobase import MockSite

openlibrary/tests/core/test_unmarshal.py

@@ -1,5 +1,5 @@
-from datetime import datetime
 import re
+from datetime import datetime
 
 import pytest
 

openlibrary/tests/core/test_vendors.py

@@ -2,13 +2,14 @@
 from unittest.mock import patch
 
 import pytest
+
 from openlibrary.core.vendors import (
-    get_amazon_metadata,
-    split_amazon_title,
-    clean_amazon_metadata_for_load,
-    betterworldbooks_fmt,
     AmazonAPI,
+    betterworldbooks_fmt,
+    clean_amazon_metadata_for_load,
+    get_amazon_metadata,
     is_dvd,
+    split_amazon_title,
 )
 
 

openlibrary/tests/core/test_waitinglist.py

@@ -1,8 +1,10 @@
-from openlibrary.core.waitinglist import WaitingLoan
-from openlibrary.core import lending
 import json
+
 import pytest
 
+from openlibrary.core import lending
+from openlibrary.core.waitinglist import WaitingLoan
+
 
 class TestWaitingLoan:
     def test_new(self, monkeypatch):

openlibrary/tests/core/test_wikidata.py

@@ -1,7 +1,9 @@
-import pytest
+from datetime import datetime, timedelta
 from unittest.mock import patch
+
+import pytest
+
 from openlibrary.core import wikidata
-from datetime import datetime, timedelta
 
 EXAMPLE_WIKIDATA_DICT = {
     'id': "Q42",

openlibrary/tests/data/test_dump.py

@@ -1,6 +1,6 @@
 import json
 
-from openlibrary.data.dump import print_dump, pgdecode
+from openlibrary.data.dump import pgdecode, print_dump
 
 
 class TestPrintDump:

openlibrary/tests/solr/test_query_utils.py

@@ -1,12 +1,13 @@
 import pytest
+
 from openlibrary.solr.query_utils import (
     EmptyTreeError,
     luqum_parser,
     luqum_remove_child,
+    luqum_remove_field,
     luqum_replace_child,
-    luqum_traverse,
     luqum_replace_field,
-    luqum_remove_field,
+    luqum_traverse,
 )
 
 REMOVE_TESTS = {

openlibrary/tests/solr/test_types_generator.py

@@ -2,7 +2,6 @@
 
 from openlibrary.solr.types_generator import generate
 
-
 root = os.path.dirname(__file__)
 
 

openlibrary/tests/solr/test_update.py

@@ -1,6 +1,6 @@
 import pytest
-from openlibrary.core.ratings import WorkRatingsSummary
 
+from openlibrary.core.ratings import WorkRatingsSummary
 from openlibrary.solr import update
 from openlibrary.solr.data_provider import DataProvider, WorkReadingLogSolrSummary
 

openlibrary/tests/solr/test_utils.py

@@ -2,7 +2,7 @@
 from unittest.mock import MagicMock
 
 import httpx
-from httpx import Response, ConnectError
+from httpx import ConnectError, Response
 
 from openlibrary.solr.utils import SolrUpdateRequest, solr_update
 

openlibrary/tests/solr/updater/test_author.py

@@ -1,5 +1,6 @@
 import httpx
 import pytest
+
 from openlibrary.solr.updater.author import AuthorSolrUpdater
 from openlibrary.tests.solr.test_update import FakeDataProvider, make_author
 

openlibrary/tests/solr/updater/test_edition.py

@@ -1,6 +1,6 @@
 import pytest
-from openlibrary.solr.updater.edition import EditionSolrUpdater
 
+from openlibrary.solr.updater.edition import EditionSolrUpdater
 from openlibrary.tests.solr.test_update import FakeDataProvider
 
 

openlibrary/tests/solr/updater/test_work.py

@@ -1,4 +1,5 @@
 import pytest
+
 from openlibrary.solr.updater.work import (
     WorkSolrBuilder,
     WorkSolrUpdater,

openlibrary/utils/__init__.py

@@ -1,10 +1,10 @@
 """Generic utilities"""
 
-from enum import Enum
 import re
+from collections.abc import Callable, Iterable
+from enum import Enum
 from subprocess import CalledProcessError, run
-from typing import TypeVar, Literal
-from collections.abc import Iterable, Callable
+from typing import Literal, TypeVar
 
 to_drop = set(''';/?:@&=+$,<>#%"{}|\\^[]`\n\r''')
 

openlibrary/utils/bulkimport.py

@@ -2,12 +2,13 @@
 going through infobase API.
 """
 
+import datetime
 import json
 import os
-import web
-import datetime
 from collections import defaultdict
 
+import web
+
 
 class DocumentLoader:
     def __init__(self, **params):

openlibrary/utils/dateutil.py

@@ -9,7 +9,6 @@
 
 from infogami.utils.view import public
 
-
 MINUTE_SECS = 60
 HALF_HOUR_SECS = MINUTE_SECS * 30
 HOUR_SECS = MINUTE_SECS * 60

openlibrary/utils/ddc.py

@@ -8,9 +8,10 @@
 """
 
 from __future__ import annotations
+
 import re
-from string import printable
 from collections.abc import Iterable
+from string import printable
 
 MULTIPLE_SPACES_RE = re.compile(r'\s+')
 DDC_RE = re.compile(