fix new linting issues from pylint 2.16

diff --git a/.pylintrc b/.pylintrc
index b230c4ec0492e03f0a090b59dd4b7432448c35e7..cbb26a4e1f704d2540e286365741366c1ab97259 100644 (file)
--- a/.pylintrc
+++ b/.pylintrc
@@ -13,6 +13,6 @@ ignored-classes=NominatimArgs,closing
 # 'too-many-ancestors' is triggered already by deriving from UserDict
 # 'not-context-manager' disabled because it causes false positives once
 #   typed Python is enabled. See also https://github.com/PyCQA/pylint/issues/5273
 # 'too-many-ancestors' is triggered already by deriving from UserDict
 # 'not-context-manager' disabled because it causes false positives once
 #   typed Python is enabled. See also https://github.com/PyCQA/pylint/issues/5273

-disable=too-few-public-methods,duplicate-code,too-many-ancestors,bad-option-value,no-self-use,not-context-manager
+disable=too-few-public-methods,duplicate-code,too-many-ancestors,bad-option-value,no-self-use,not-context-manager,use-dict-literal

 
 good-names=i,x,y,m,t,fd,db,cc
 
 good-names=i,x,y,m,t,fd,db,cc

diff --git a/nominatim/api/results.py b/nominatim/api/results.py
index b952f6fd0bb30f30a7a19a170ead7f3c47f2541e..779911e97a1cada25fd50b56985539a8da733d37 100644 (file)
--- a/nominatim/api/results.py
+++ b/nominatim/api/results.py
@@ -11,7 +11,7 @@ Data classes are part of the public API while the functions are for
 internal use only. That's why they are implemented as free-standing functions
 instead of member functions.
 """
 internal use only. That's why they are implemented as free-standing functions
 instead of member functions.
 """

-from typing import Optional, Tuple, Dict, Sequence, Any
+from typing import Optional, Tuple, Dict, Sequence

 import enum
 import dataclasses
 import datetime as dt
 import enum
 import dataclasses
 import datetime as dt

diff --git a/nominatim/tools/migration.py b/nominatim/tools/migration.py
index 545f5c486a9c15e76106f081e4a1f1beb34ef761..7d117a8c7f495209703c25d9b8a1364d8725515c 100644 (file)
--- a/nominatim/tools/migration.py
+++ b/nominatim/tools/migration.py
@@ -104,7 +104,7 @@ def _migration(major: int, minor: int, patch: int = 0,
         there.
     """
     def decorator(func: Callable[..., None]) -> Callable[..., None]:
         there.
     """
     def decorator(func: Callable[..., None]) -> Callable[..., None]:

-        version = (NominatimVersion(major, minor, patch, dbpatch))
+        version = NominatimVersion(major, minor, patch, dbpatch)

         _MIGRATION_FUNCTIONS.append((version, func))
         return func
 
         _MIGRATION_FUNCTIONS.append((version, func))
         return func