fix linting issues

diff --git a/nominatim/cli.py b/nominatim/cli.py
index 487206c1562e7d796f35a30c6b1799e47cb2109d..68d3cca8ea302acfb007998e2065d9b243d24cba 100644 (file)
--- a/nominatim/cli.py
+++ b/nominatim/cli.py
@@ -92,11 +92,11 @@ class CommandlineParser:
 
         try:
             return args.command.run(args)
-        except UsageError as e:
+        except UsageError as exception:
             log = logging.getLogger()
             if log.isEnabledFor(logging.DEBUG):
                 raise # use Python's exception printing
-            log.fatal('FATAL: ' + str(e))
+            log.fatal('FATAL: %s', exception)
 
         # If we get here, then execution has failed in some way.
         return 1
@@ -124,7 +124,7 @@ def _osm2pgsql_options_from_args(args, default_cache, default_threads):
 # No need to document the functions each time.
 # pylint: disable=C0111
 # Using non-top-level imports to make pyosmium optional for replication only.
-# pylint: disable=C0415
+# pylint: disable=E0012,C0415
 
 
 class SetupAll:

diff --git a/nominatim/errors.py b/nominatim/errors.py
index 80181aba48cd7c3f55fbd057b39e4553944d403e..e77f956a4eab01df45106dcc1fb375ab6f277996 100644 (file)
--- a/nominatim/errors.py
+++ b/nominatim/errors.py
@@ -6,4 +6,3 @@ class UsageError(Exception):
     """ An error raised because of bad user input. This error will usually
         not cause a stack trace to be printed unless debugging is enabled.
     """
-    pass