remove remaining pylint hints

diff --git a/src/nominatim_api/__init__.py b/src/nominatim_api/__init__.py
index 242ff892ffab4a96e231ae060f83621e6918e974..89c57b651dfa5c0a81346b9ed03c17ec204fd946 100644 (file)
--- a/src/nominatim_api/__init__.py
+++ b/src/nominatim_api/__init__.py
@@ -11,9 +11,6 @@ Classes and functions defined in this file are considered stable. Always
 import from this file, not from the source files directly.
 """
 
 import from this file, not from the source files directly.
 """
 

-# See also https://github.com/PyCQA/pylint/issues/6006
-# pylint: disable=useless-import-alias
-

 from .errors import (UsageError as UsageError)
 from .config import (Configuration as Configuration)
 
 from .errors import (UsageError as UsageError)
 from .config import (Configuration as Configuration)
 

diff --git a/src/nominatim_api/result_formatting.py b/src/nominatim_api/result_formatting.py
index b6d26c31736afd0d8158b9e5436f914174013fc9..0f91b7610ec85fc44cbe58a91d4036b969171443 100644 (file)
--- a/src/nominatim_api/result_formatting.py
+++ b/src/nominatim_api/result_formatting.py
@@ -14,7 +14,7 @@ import importlib
 
 from .server.content_types import CONTENT_JSON
 
 
 from .server.content_types import CONTENT_JSON
 

-T = TypeVar('T')  # pylint: disable=invalid-name
+T = TypeVar('T')

 FormatFunc = Callable[[T, Mapping[str, Any]], str]
 ErrorFormatFunc = Callable[[str, str, int], str]
 
 FormatFunc = Callable[[T, Mapping[str, Any]], str]
 ErrorFormatFunc = Callable[[str, str, int], str]
 

diff --git a/src/nominatim_api/reverse.py b/src/nominatim_api/reverse.py
index e0c1d11831ec2776bc076cc8205d6e867d014a6c..1b06e659fbfb5b98edf16d708f13bb3c0e0d8ee3 100644 (file)
--- a/src/nominatim_api/reverse.py
+++ b/src/nominatim_api/reverse.py
@@ -20,9 +20,6 @@ from . import results as nres
 from .logging import log
 from .types import AnyPoint, DataLayer, ReverseDetails, GeometryFormat, Bbox
 
 from .logging import log
 from .types import AnyPoint, DataLayer, ReverseDetails, GeometryFormat, Bbox
 

-# In SQLAlchemy expression which compare with NULL need to be expressed with
-# the equal sign.
-# pylint: disable=singleton-comparison

 
 RowFunc = Callable[[Optional[SaRow], Type[nres.ReverseResult]], Optional[nres.ReverseResult]]
 
 
 RowFunc = Callable[[Optional[SaRow], Type[nres.ReverseResult]], Optional[nres.ReverseResult]]
 

diff --git a/src/nominatim_api/search/__init__.py b/src/nominatim_api/search/__init__.py
index 91be4253f1ccc8af2ed4ecf033b6dbe6cce686dc..956d91d8416c4c6b3ca42851256fd23a5ffbd488 100644 (file)
--- a/src/nominatim_api/search/__init__.py
+++ b/src/nominatim_api/search/__init__.py
@@ -7,8 +7,6 @@
 """
 Module for forward search.
 """
 """
 Module for forward search.
 """

-# pylint: disable=useless-import-alias
-

 from .geocoder import (ForwardGeocoder as ForwardGeocoder)
 from .query import (Phrase as Phrase,
                     PhraseType as PhraseType)
 from .geocoder import (ForwardGeocoder as ForwardGeocoder)
 from .query import (Phrase as Phrase,
                     PhraseType as PhraseType)

diff --git a/src/nominatim_api/sql/sqlalchemy_types/__init__.py b/src/nominatim_api/sql/sqlalchemy_types/__init__.py
index 1383b5ee5df8340affee54cead982689bca9faf0..b4f773c793e5f3a596fecba5e0897544142c6a4b 100644 (file)
--- a/src/nominatim_api/sql/sqlalchemy_types/__init__.py
+++ b/src/nominatim_api/sql/sqlalchemy_types/__init__.py
@@ -8,9 +8,6 @@
 Module with custom types for SQLAlchemy
 """
 
 Module with custom types for SQLAlchemy
 """
 

-# See also https://github.com/PyCQA/pylint/issues/6006
-# pylint: disable=useless-import-alias
-

 from .geometry import (Geometry as Geometry)
 from .int_array import (IntArray as IntArray)
 from .key_value import (KeyValueStore as KeyValueStore)
 from .geometry import (Geometry as Geometry)
 from .int_array import (IntArray as IntArray)
 from .key_value import (KeyValueStore as KeyValueStore)

diff --git a/src/nominatim_api/v1/classtypes.py b/src/nominatim_api/v1/classtypes.py
index 3224232c4f85da30cc07ceb3b84d6cfdb37fb61d..7198b412e2cb9badf31a3910c73b74d90bf48c20 100644 (file)
--- a/src/nominatim_api/v1/classtypes.py
+++ b/src/nominatim_api/v1/classtypes.py
@@ -61,7 +61,6 @@ def bbox_from_result(result: Union[ReverseResult, SearchResult]) -> Bbox:
     return result.bbox
 
 
     return result.bbox
 
 

-# pylint: disable=line-too-long

 OSM_ATTRIBUTION = 'Data © OpenStreetMap contributors, ODbL 1.0. http://osm.org/copyright'
 
 
 OSM_ATTRIBUTION = 'Data © OpenStreetMap contributors, ODbL 1.0. http://osm.org/copyright'
 
 

diff --git a/src/nominatim_db/clicmd/__init__.py b/src/nominatim_db/clicmd/__init__.py
index 725b4d6b52cbf92d8e7926855a245c8d51e0464a..6140100e90cf69632c689d61b3b4d70b632b1478 100644 (file)
--- a/src/nominatim_db/clicmd/__init__.py
+++ b/src/nominatim_db/clicmd/__init__.py
@@ -7,9 +7,6 @@
 """
 Subcommand definitions for the command-line tool.
 """
 """
 Subcommand definitions for the command-line tool.
 """

-# mypy and pylint disagree about the style of explicit exports,
-# see https://github.com/PyCQA/pylint/issues/6006.
-# pylint: disable=useless-import-alias

 
 from .setup import SetupAll as SetupAll
 from .replication import UpdateReplication as UpdateReplication
 
 from .setup import SetupAll as SetupAll
 from .replication import UpdateReplication as UpdateReplication

diff --git a/src/nominatim_db/clicmd/admin.py b/src/nominatim_db/clicmd/admin.py
index ba0b0458ab6978f52d47e6715c5598492f808bf3..85482ea403fa53af1f4d92f50abb5f9a2f360cf0 100644 (file)
--- a/src/nominatim_db/clicmd/admin.py
+++ b/src/nominatim_db/clicmd/admin.py
@@ -15,10 +15,6 @@ from ..errors import UsageError
 from ..db.connection import connect, table_exists
 from .args import NominatimArgs
 
 from ..db.connection import connect, table_exists
 from .args import NominatimArgs
 

-# Do not repeat documentation of subcommand classes.
-# pylint: disable=C0111
-# Using non-top-level imports to avoid eventually unused imports.
-# pylint: disable=E0012,C0415

 
 LOG = logging.getLogger()
 
 
 LOG = logging.getLogger()
 


@@ -58,7 +54,6 @@ class AdminFuncs:
                             help='Analyse indexing of the given Nominatim object')
 
     def run(self, args: NominatimArgs) -> int:
                             help='Analyse indexing of the given Nominatim object')
 
     def run(self, args: NominatimArgs) -> int:

-        # pylint: disable=too-many-return-statements

         if args.warm:
             return self._warm(args)
 
         if args.warm:
             return self._warm(args)
 

diff --git a/src/nominatim_db/clicmd/replication.py b/src/nominatim_db/clicmd/replication.py
index ec85cc8bc682143704bdbdf47da34b28bc7a06fc..da60eafe1a49a632d652bae7439690d11d732fbc 100644 (file)
--- a/src/nominatim_db/clicmd/replication.py
+++ b/src/nominatim_db/clicmd/replication.py
@@ -116,7 +116,6 @@ class UpdateReplication:
         return update_interval
 
     async def _update(self, args: NominatimArgs) -> None:
         return update_interval
 
     async def _update(self, args: NominatimArgs) -> None:

-        # pylint: disable=too-many-locals

         from ..tools import replication
         from ..indexer.indexer import Indexer
         from ..tokenizer import factory as tokenizer_factory
         from ..tools import replication
         from ..indexer.indexer import Indexer
         from ..tokenizer import factory as tokenizer_factory

diff --git a/src/nominatim_db/tools/special_phrases/sp_importer.py b/src/nominatim_db/tools/special_phrases/sp_importer.py
index 0e0d70946453885c28d63a38c9bb9b5389078250..40b089a76623c443c743093d3d6d2ee4d0b09e78 100644 (file)
--- a/src/nominatim_db/tools/special_phrases/sp_importer.py
+++ b/src/nominatim_db/tools/special_phrases/sp_importer.py
@@ -45,7 +45,6 @@ class SpecialPhraseLoader(Protocol):
 
 
 class SPImporter():
 
 
 class SPImporter():

-    # pylint: disable-msg=too-many-instance-attributes

     """
         Class handling the process of special phrases importation into the database.
 
     """
         Class handling the process of special phrases importation into the database.