Revert "internetarchive#10196 Removed redundant # noqa comments"

This reverts commit 0e51e9c.

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -61,4 +61,4 @@ body:
   - type: markdown
     attributes:
       value: |
-        Thanks for taking the time to fill out this bug report! 👍
+        Thanks for taking the time to fill out this bug report! 👍

.storybook/main.js

@@ -21,4 +21,4 @@ module.exports = {
   "addons": [
     "@storybook/addon-essentials"
   ],
-}
+}

.storybook/preview.js

@@ -1,4 +1,4 @@
 
 export const parameters = {
   actions: { argTypesRegex: "^on[A-Z].*" },
-}
+}

conf/solr/conf/wordtypes.txt

@@ -20,4 +20,4 @@
 # "copyright" symbol (©), see https://github.com/internetarchive/openlibrary/issues/7555
 \u00A9 => ALPHANUM
 # number sign (#), only as alphabetic for case like 'C#'
-\u0023 => ALPHA
+\u0023 => ALPHA

openlibrary/accounts/__init__.py

@@ -4,7 +4,7 @@
 
 # FIXME: several modules import things from accounts.model
 # directly through openlibrary.accounts
-from .model import *
+from .model import *  # noqa: F403
 from .model import Account, Link
 
 if TYPE_CHECKING:

openlibrary/accounts/model.py

@@ -15,11 +15,11 @@
 
 import requests
 import web
+from validate_email import validate_email
+
 from infogami import config
 from infogami.infobase.client import ClientException
 from infogami.utils.view import public, render_template
-from validate_email import validate_email
-
 from openlibrary.core import helpers, stats
 from openlibrary.core.booknotes import Booknotes
 from openlibrary.core.bookshelves import Bookshelves

openlibrary/admin/code.py

@@ -1,8 +1,8 @@
 import os
 
 import web
-from infogami.utils.view import render_template
 
+from infogami.utils.view import render_template
 from openlibrary.admin import utils
 from openlibrary.core import admin
 

openlibrary/admin/utils.py

@@ -2,6 +2,7 @@
 """
 
 import web
+
 from infogami.utils import delegate, features
 from infogami.utils.view import render_template
 

openlibrary/app.py

@@ -1,10 +1,11 @@
 """Utilities to build the app.
 """
 
+from web.template import TemplateResult
+
 from infogami.utils import app as _app
 from infogami.utils.macro import macro
 from infogami.utils.view import public, render
-from web.template import TemplateResult
 
 
 class view(_app.page):

openlibrary/book_providers.py

@@ -705,4 +705,4 @@ def get_solr_keys() -> list[str]:
     return [p.solr_key for p in PROVIDER_ORDER if p.solr_key]
 
 
-get_book_provider.ia = get_book_provider_by_name("ia")
+setattr(get_book_provider, 'ia', get_book_provider_by_name('ia'))  # noqa: B010

openlibrary/catalog/add_book/__init__.py

@@ -32,8 +32,8 @@
 
 import requests
 import web
-from infogami import config
 
+from infogami import config
 from openlibrary import accounts
 from openlibrary.catalog.add_book.load_book import (
     InvalidLanguage,

openlibrary/catalog/add_book/match.py

@@ -310,15 +310,15 @@ def compare_authors(e1: dict, e2: dict):
     :rtype: tuple
     :return: str?, message, score
     """
-    if 'authors' in e1 and 'authors' in e2:
+    if 'authors' in e1 and 'authors' in e2:  # noqa: SIM102
         if compare_author_fields(e1['authors'], e2['authors']):
             return ('authors', 'exact match', 125)
 
-    if 'authors' in e1 and 'contribs' in e2:
+    if 'authors' in e1 and 'contribs' in e2:  # noqa: SIM102
         if compare_author_fields(e1['authors'], e2['contribs']):
             return ('authors', 'exact match', 125)
 
-    if 'contribs' in e1 and 'authors' in e2:
+    if 'contribs' in e1 and 'authors' in e2:  # noqa: SIM102
         if compare_author_fields(e1['contribs'], e2['authors']):
             return ('authors', 'exact match', 125)
 

openlibrary/catalog/add_book/tests/test_add_book.py

@@ -2,9 +2,9 @@
 from datetime import datetime
 
 import pytest
+
 from infogami.infobase.client import Nothing
 from infogami.infobase.core import Text
-
 from openlibrary.catalog import add_book
 from openlibrary.catalog.add_book import (
     IndependentlyPublished,

openlibrary/catalog/get_ia.py

@@ -2,9 +2,9 @@
 
 import lxml.etree
 import requests
-from infogami import config
 from lxml import etree
 
+from infogami import config
 from openlibrary.catalog.marc.marc_binary import MarcBinary
 from openlibrary.catalog.marc.marc_xml import MarcXml
 from openlibrary.core import ia

openlibrary/catalog/marc/marc_base.py

@@ -73,7 +73,7 @@ def get_control(self, tag: str) -> str | None:
         control = self.read_fields([tag])
         _, v = next(control, (tag, None))
         assert isinstance(v, (str, type(None)))
-        if tag == '008' and v:
+        if tag == '008' and v:  # noqa: SIM102
             # Handle duplicate 008s, even though control fields are non-repeatable.
             if others := [str(d) for _, d in list(control) if len(str(d)) == 40]:
                 return min(others + [v], key=lambda s: s.count(' '))

openlibrary/catalog/marc/parse.py

@@ -446,7 +446,7 @@ def read_author_person(field: MarcFieldBase, tag: str = '100') -> dict | None:
             author[field_name] = name_from_list(contents[subfield])
     if 'q' in contents:
         author['fuller_name'] = ' '.join(contents['q'])
-    if '6' in contents:
+    if '6' in contents:  # noqa: SIM102 - alternate script name exists
         if (link := field.rec.get_linkage(tag, contents['6'][0])) and (
             alt_name := link.get_subfield_values('a')
         ):

openlibrary/catalog/marc/tests/test_data/xml_expect/0descriptionofta1682unit.json

@@ -37,4 +37,4 @@
   "publish_places": [
     "Washington"
   ]
-}
+}

openlibrary/catalog/marc/tests/test_data/xml_expect/39002054008678_yale_edu.json

@@ -39,4 +39,4 @@
     "Description and travel",
     "History"
   ]
-}
+}

openlibrary/catalog/marc/tests/test_data/xml_expect/cu31924091184469.json

@@ -37,4 +37,4 @@
   "publish_places": [
     "New York"
   ]
-}
+}

openlibrary/catalog/marc/tests/test_data/xml_expect/engineercorpsofh00sher.json

@@ -35,4 +35,4 @@
   "publish_places": [
     "San Francisco?"
   ]
-}
+}

openlibrary/catalog/marc/tests/test_data/xml_expect/flatlandromanceo00abbouoft.json

@@ -26,4 +26,4 @@
   "publish_places": [
     "London"
   ]
-}
+}

openlibrary/catalog/marc/tests/test_data/xml_expect/secretcodeofsucc00stjo.json

@@ -112,4 +112,4 @@
   "oclc_numbers": [
     "232977651"
   ]
-}
+}

openlibrary/catalog/marc/tests/test_data/xml_expect/warofrebellionco1473unit.json

@@ -56,4 +56,4 @@
     "Regimental histories",
     "History"
   ]
-}
+}

openlibrary/catalog/marc/tests/test_data/xml_input/00schlgoog_marc.xml

@@ -66,4 +66,4 @@
     <subfield code="m">Hebr</subfield>
     <subfield code="w">PREM</subfield>
   </datafield>
-</record>
+</record>

openlibrary/catalog/marc/tests/test_data/xml_input/abhandlungender01ggoog_marc.xml

@@ -221,4 +221,4 @@
   <datafield tag="MDM" ind1="9" ind2=" ">
     <subfield code="a">Multiple digitized volumes exist for this title--see holdings for URLs</subfield>
   </datafield>
-</record>
+</record>

openlibrary/catalog/marc/tests/test_data/xml_input/cu31924091184469_marc.xml

@@ -94,4 +94,4 @@
       <subfield code="d">20070405</subfield>
     </datafield>
   </record>
-</collection>
+</collection>

openlibrary/catalog/marc/tests/test_data/xml_input/soilsurveyrepor00statgoog_marc.xml

@@ -78,4 +78,4 @@
     <subfield code="h">S599.I7A3</subfield>
     <subfield code="w">SERLOC</subfield>
   </datafield>
-</record>
+</record>

openlibrary/code.py

@@ -46,6 +46,7 @@ def setup():
     load_views()
 
     # load actions
+    from . import actions  # noqa: F401 side effects may be needed
 
     logger.info("loading complete.")
 
@@ -63,6 +64,7 @@ def setup_logging():
 
 def load_views():
     """Registers all views by loading all view modules."""
+    from .views import showmarc  # noqa: F401 side effects may be needed
 
 
 setup()

openlibrary/components/LibraryExplorer/ddc.json

@@ -6739,4 +6739,4 @@
     ],
     "count": 645745
   }
-]
+]

openlibrary/components/LibraryExplorer/lcc.json

@@ -1547,4 +1547,4 @@
     ],
     "count": 177625
   }
-]
+]

openlibrary/config.py

@@ -4,8 +4,9 @@
 import os
 import sys
 
-import infogami
 import yaml
+
+import infogami
 from infogami import config
 from infogami.infobase import server
 

openlibrary/conftest.py

@@ -3,12 +3,19 @@
 
 import pytest
 import web
+
 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.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_memcache import (
+    mock_memcache,  # noqa: F401 side effects may be needed
+)
 
 
 @pytest.fixture(autouse=True)

openlibrary/core/admin.py

@@ -5,8 +5,8 @@
 
 import requests
 import web
-from infogami import config
 
+from infogami import config
 from openlibrary.core import cache
 
 

openlibrary/core/bookshelves.py

@@ -5,8 +5,8 @@
 from typing import Any, Final, Literal, TypedDict, cast
 
 import web
-from infogami.infobase.utils import flatten
 
+from infogami.infobase.utils import flatten
 from openlibrary.plugins.worksearch.search import get_solr
 from openlibrary.utils.dateutil import DATE_ONE_MONTH_AGO, DATE_ONE_WEEK_AGO
 

openlibrary/core/cache.py

@@ -13,10 +13,10 @@
 
 import memcache
 import web
+
 from infogami import config
 from infogami.infobase.client import Nothing
 from infogami.utils import stats
-
 from openlibrary.core.helpers import NothingEncoder
 from openlibrary.utils import olmemcache
 from openlibrary.utils.dateutil import MINUTE_SECS

openlibrary/core/db.py

@@ -6,9 +6,10 @@
 from sqlite3 import IntegrityError
 
 import web
-from infogami.utils import stats
 from psycopg2.errors import UniqueViolation
 
+from infogami.utils import stats
+
 
 @web.memoize
 def _get_db():

openlibrary/core/edits.py

@@ -2,9 +2,9 @@
 import json
 from sqlite3 import IntegrityError
 
-from infogami.utils.view import public
 from psycopg2.errors import UniqueViolation
 
+from infogami.utils.view import public
 from openlibrary.core import cache
 from openlibrary.i18n import gettext as _
 from openlibrary.utils import dateutil

openlibrary/core/fulltext.py

@@ -4,8 +4,8 @@
 
 import requests
 import web
-from infogami import config
 
+from infogami import config
 from openlibrary.core.lending import get_availability_of_ocaids
 from openlibrary.plugins.openlibrary.home import format_book_data
 

openlibrary/core/ia.py

@@ -7,9 +7,9 @@
 
 import requests
 import web
+
 from infogami import config
 from infogami.utils import stats
-
 from openlibrary.core import cache
 
 logger = logging.getLogger('openlibrary.ia')
@@ -309,7 +309,9 @@ def get_candidates_url(
             '!noindex:true',
         ]
     )
-    exempt_collections = ' OR '.join(["collection:thoth-archiving-network"])
+    exempt_collections = ' OR '.join(  # noqa: FLY002
+        ["collection:thoth-archiving-network"]
+    )
     params = {
         'q': f'({hard_requirements}) AND (({soft_requirements}) OR ({exempt_collections}))',
         'fl': 'identifier,format',