Fixed linting errors

diff --git a/nominatim/clicmd/setup.py b/nominatim/clicmd/setup.py
index d93a118fa987d75828d00917c790ccf35b23b869..fd2c685bd11604f827bc04ac5687cddd5c300c3a 100644 (file)
--- a/nominatim/clicmd/setup.py
+++ b/nominatim/clicmd/setup.py
@@ -84,21 +84,19 @@ class SetupAll:
             files = args.get_osm_file_list()
             if not files:
                 raise UsageError("No input files (use --osm-file).")
             files = args.get_osm_file_list()
             if not files:
                 raise UsageError("No input files (use --osm-file).")

-            
+

             if args.no_superuser and args.prepare_database:
                 raise UsageError("Cannot use --no-superuser and --prepare-database together.")
 
             if args.no_superuser and args.prepare_database:
                 raise UsageError("Cannot use --no-superuser and --prepare-database together.")
 

-            complete_import = not args.no_superuser and not args.prepare_database
-
-            if args.prepare_database or complete_import:
+            if args.prepare_database or self.is_complete_import(args):

                 LOG.warning('Creating database')
                 database_import.setup_database_skeleton(args.config.get_libpq_dsn(),
                                                         rouser=args.config.DATABASE_WEBUSER)
                 LOG.warning('Creating database')
                 database_import.setup_database_skeleton(args.config.get_libpq_dsn(),
                                                         rouser=args.config.DATABASE_WEBUSER)

-                
-                if not complete_import:
+
+                if not self.is_complete_import(args):

                     return 0
                     return 0

-                
-            if not args.prepare_database or args.no_superuser or complete_import:
+
+            if not args.prepare_database or args.no_superuser or self.is_complete_import(args):

                 # Check if the correct plugins are installed
                 database_import.check_existing_database_plugins(args.config.get_libpq_dsn())
                 LOG.warning('Setting up country tables')
                 # Check if the correct plugins are installed
                 database_import.check_existing_database_plugins(args.config.get_libpq_dsn())
                 LOG.warning('Setting up country tables')


@@ -172,6 +170,11 @@ class SetupAll:
         self._finalize_database(args.config.get_libpq_dsn(), args.offline)
 
         return 0
         self._finalize_database(args.config.get_libpq_dsn(), args.offline)
 
         return 0

+    
+    def _is_complete_import(self, args: NominatimArgs) -> bool:
+        """ Determine if the import is complete or if only the database should be prepared.
+        """
+        return not args.no_superuser and not args.prepare_database

 
 
     def _setup_tables(self, config: Configuration, reverse_only: bool) -> None:
 
 
     def _setup_tables(self, config: Configuration, reverse_only: bool) -> None:

diff --git a/nominatim/tools/database_import.py b/nominatim/tools/database_import.py
index 7251329c48976b3adc3e266689aa7040e708187c..dbbb196eede15a42283793deb9194b8669f72a93 100644 (file)
--- a/nominatim/tools/database_import.py
+++ b/nominatim/tools/database_import.py
@@ -39,6 +39,7 @@ def _require_version(module: str, actual: Tuple[int, int], expected: Tuple[int,
 
 
 def check_existing_database_plugins(dsn: str):
 
 
 def check_existing_database_plugins(dsn: str):

+    """ Check that the database has the required plugins installed."""

     with connect(dsn) as conn:
         _require_version('PostgreSQL server',
                          conn.server_version_tuple(),
     with connect(dsn) as conn:
         _require_version('PostgreSQL server',
                          conn.server_version_tuple(),