hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-03-11 05:14:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

use absolute imports in Python code

Browse Source 
Relative imports are no longer officially recommended.
This commit is contained in:
Sarah Hoffmann
2021-04-16 14:20:09 +02:00
parent c64193f839
commit 76b1885595
23 changed files with 67 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
nominatim/cli.py
View File

@@ -8,12 +8,12 @@ import sys
import argparse import argparse
from pathlib import Path from pathlib import Path
from .config import Configuration from nominatim.config import Configuration
from .tools.exec_utils import run_legacy_script, run_php_server from nominatim.tools.exec_utils import run_legacy_script, run_php_server
from .errors import UsageError from nominatim.errors import UsageError
from . import clicmd from nominatim import clicmd
from .clicmd.args import NominatimArgs from nominatim.clicmd.args import NominatimArgs
from .tools import tiger_data from nominatim.tools import tiger_data
LOG = logging.getLogger() LOG = logging.getLogger()

18
nominatim/clicmd/__init__.py
View File

@@ -2,12 +2,12 @@
Subcommand definitions for the command-line tool. Subcommand definitions for the command-line tool.
""" """
from .setup import SetupAll from nominatim.clicmd.setup import SetupAll
from .replication import UpdateReplication from nominatim.clicmd.replication import UpdateReplication
from .api import APISearch, APIReverse, APILookup, APIDetails, APIStatus from nominatim.clicmd.api import APISearch, APIReverse, APILookup, APIDetails, APIStatus
from .index import UpdateIndex from nominatim.clicmd.index import UpdateIndex
from .refresh import UpdateRefresh from nominatim.clicmd.refresh import UpdateRefresh
from .admin import AdminFuncs from nominatim.clicmd.admin import AdminFuncs
from .freeze import SetupFreeze from nominatim.clicmd.freeze import SetupFreeze
from .transition import AdminTransition from nominatim.clicmd.transition import AdminTransition
from .special_phrases import ImportSpecialPhrases from nominatim.clicmd.special_phrases import ImportSpecialPhrases

4
nominatim/clicmd/admin.py
View File

@@ -3,8 +3,8 @@ Implementation of the 'admin' subcommand.
""" """
import logging import logging
from ..tools.exec_utils import run_legacy_script from nominatim.tools.exec_utils import run_legacy_script
from ..db.connection import connect from nominatim.db.connection import connect
# Do not repeat documentation of subcommand classes. # Do not repeat documentation of subcommand classes.
# pylint: disable=C0111 # pylint: disable=C0111

2
nominatim/clicmd/api.py
View File

@@ -3,7 +3,7 @@ Subcommand definitions for API calls from the command line.
""" """
import logging import logging
from ..tools.exec_utils import run_api_script from nominatim.tools.exec_utils import run_api_script
# Do not repeat documentation of subcommand classes. # Do not repeat documentation of subcommand classes.
# pylint: disable=C0111 # pylint: disable=C0111

2
nominatim/clicmd/freeze.py
View File

@@ -2,7 +2,7 @@
Implementation of the 'freeze' subcommand. Implementation of the 'freeze' subcommand.
""" """
from ..db.connection import connect from nominatim.db.connection import connect
# Do not repeat documentation of subcommand classes. # Do not repeat documentation of subcommand classes.
# pylint: disable=C0111 # pylint: disable=C0111

4
nominatim/clicmd/index.py
View File

@@ -3,8 +3,8 @@ Implementation of the 'index' subcommand.
""" """
import psutil import psutil
from ..db import status from nominatim.db import status
from ..db.connection import connect from nominatim.db.connection import connect
# Do not repeat documentation of subcommand classes. # Do not repeat documentation of subcommand classes.
# pylint: disable=C0111 # pylint: disable=C0111

2
nominatim/clicmd/refresh.py
View File

@@ -4,7 +4,7 @@ Implementation of 'refresh' subcommand.
import logging import logging
from pathlib import Path from pathlib import Path
from ..db.connection import connect from nominatim.db.connection import connect
# Do not repeat documentation of subcommand classes. # Do not repeat documentation of subcommand classes.
# pylint: disable=C0111 # pylint: disable=C0111

6
nominatim/clicmd/replication.py
View File

@@ -6,9 +6,9 @@ import logging
import socket import socket
import time import time
from ..db import status from nominatim.db import status
from ..db.connection import connect from nominatim.db.connection import connect
from ..errors import UsageError from nominatim.errors import UsageError
LOG = logging.getLogger() LOG = logging.getLogger()

10
nominatim/clicmd/setup.py
View File

@@ -6,11 +6,11 @@ from pathlib import Path
import psutil import psutil
from ..tools.exec_utils import run_legacy_script from nominatim.tools.exec_utils import run_legacy_script
from ..db.connection import connect from nominatim.db.connection import connect
from ..db import status, properties from nominatim.db import status, properties
from ..version import NOMINATIM_VERSION from nominatim.version import NOMINATIM_VERSION
from ..errors import UsageError from nominatim.errors import UsageError
# Do not repeat documentation of subcommand classes. # Do not repeat documentation of subcommand classes.
# pylint: disable=C0111 # pylint: disable=C0111

6
nominatim/clicmd/transition.py
View File

@@ -8,9 +8,9 @@ This module will be removed as soon as the transition phase is over.
import logging import logging
from pathlib import Path from pathlib import Path
from ..db.connection import connect from nominatim.db.connection import connect
from ..db import status from nominatim.db import status
from ..errors import UsageError from nominatim.errors import UsageError
# Do not repeat documentation of subcommand classes. # Do not repeat documentation of subcommand classes.
# pylint: disable=C0111 # pylint: disable=C0111

2
nominatim/config.py
View File

@@ -7,7 +7,7 @@ from pathlib import Path
from dotenv import dotenv_values from dotenv import dotenv_values
from .errors import UsageError from nominatim.errors import UsageError
LOG = logging.getLogger() LOG = logging.getLogger()

2
nominatim/db/connection.py
View File

@@ -9,7 +9,7 @@ import psycopg2
import psycopg2.extensions import psycopg2.extensions
import psycopg2.extras import psycopg2.extras
from ..errors import UsageError from nominatim.errors import UsageError
LOG = logging.getLogger() LOG = logging.getLogger()

4
nominatim/db/status.py
View File

@@ -5,8 +5,8 @@ import datetime as dt
import logging import logging
import re import re
from ..tools.exec_utils import get_url from nominatim.tools.exec_utils import get_url
from ..errors import UsageError from nominatim.errors import UsageError
LOG = logging.getLogger() LOG = logging.getLogger()

4
nominatim/db/utils.py
View File

@@ -5,8 +5,8 @@ import subprocess
import logging import logging
import gzip import gzip
from .connection import get_pg_env from nominatim.db.connection import get_pg_env
from ..errors import UsageError from nominatim.errors import UsageError
LOG = logging.getLogger() LOG = logging.getLogger()

4
nominatim/indexer/indexer.py
View File

@@ -7,8 +7,8 @@ import select
import psycopg2 import psycopg2
from .progress import ProgressLogger from nominatim.indexer.progress import ProgressLogger
from ..db.async_connection import DBConnection from nominatim.db.async_connection import DBConnection
LOG = logging.getLogger() LOG = logging.getLogger()

2
nominatim/tools/admin.py
View File

@@ -3,7 +3,7 @@ Functions for database analysis and maintenance.
""" """
import logging import logging
from ..errors import UsageError from nominatim.errors import UsageError
LOG = logging.getLogger() LOG = logging.getLogger()

4
nominatim/tools/check_database.py
View File

@@ -6,8 +6,8 @@ from textwrap import dedent
import psycopg2 import psycopg2
from ..db.connection import connect from nominatim.db.connection import connect
from ..errors import UsageError from nominatim.errors import UsageError
CHECKLIST = [] CHECKLIST = []

14
nominatim/tools/database_import.py
View File

@@ -11,13 +11,13 @@ from pathlib import Path
import psutil import psutil
import psycopg2 import psycopg2
from ..db.connection import connect, get_pg_env from nominatim.db.connection import connect, get_pg_env
from ..db import utils as db_utils from nominatim.db import utils as db_utils
from ..db.async_connection import DBConnection from nominatim.db.async_connection import DBConnection
from ..db.sql_preprocessor import SQLPreprocessor from nominatim.db.sql_preprocessor import SQLPreprocessor
from .exec_utils import run_osm2pgsql from nominatim.tools.exec_utils import run_osm2pgsql
from ..errors import UsageError from nominatim.errors import UsageError
from ..version import POSTGRESQL_REQUIRED_VERSION, POSTGIS_REQUIRED_VERSION from nominatim.version import POSTGRESQL_REQUIRED_VERSION, POSTGIS_REQUIRED_VERSION
LOG = logging.getLogger() LOG = logging.getLogger()

4
nominatim/tools/exec_utils.py
View File

@@ -6,8 +6,8 @@ import subprocess
import urllib.request as urlrequest import urllib.request as urlrequest
from urllib.parse import urlencode from urllib.parse import urlencode
from ..version import NOMINATIM_VERSION from nominatim.version import NOMINATIM_VERSION
from ..db.connection import get_pg_env from nominatim.db.connection import get_pg_env
LOG = logging.getLogger() LOG = logging.getLogger()

10
nominatim/tools/migration.py
View File

@@ -3,11 +3,11 @@ Functions for database migration to newer software versions.
""" """
import logging import logging
from ..db import properties from nominatim.db import properties
from ..db.connection import connect from nominatim.db.connection import connect
from ..version import NOMINATIM_VERSION from nominatim.version import NOMINATIM_VERSION
from . import refresh, database_import from nominatim.tools import refresh, database_import
from ..errors import UsageError from nominatim.errors import UsageError
LOG = logging.getLogger() LOG = logging.getLogger()

6
nominatim/tools/refresh.py
View File

@@ -7,9 +7,9 @@ from textwrap import dedent
from psycopg2.extras import execute_values from psycopg2.extras import execute_values
from ..db.utils import execute_file from nominatim.db.utils import execute_file
from ..db.sql_preprocessor import SQLPreprocessor from nominatim.db.sql_preprocessor import SQLPreprocessor
from ..version import NOMINATIM_VERSION from nominatim.version import NOMINATIM_VERSION
LOG = logging.getLogger() LOG = logging.getLogger()

6
nominatim/tools/replication.py
View File

@@ -6,9 +6,9 @@ from enum import Enum
import logging import logging
import time import time
from ..db import status from nominatim.db import status
from .exec_utils import run_osm2pgsql from nominatim.tools.exec_utils import run_osm2pgsql
from ..errors import UsageError from nominatim.errors import UsageError
try: try:
from osmium.replication.server import ReplicationServer from osmium.replication.server import ReplicationServer

6
nominatim/tools/tiger_data.py
View File

@@ -6,9 +6,9 @@ import os
import tarfile import tarfile
import selectors import selectors
from ..db.connection import connect from nominatim.db.connection import connect
from ..db.async_connection import DBConnection from nominatim.db.async_connection import DBConnection
from ..db.sql_preprocessor import SQLPreprocessor from nominatim.db.sql_preprocessor import SQLPreprocessor
LOG = logging.getLogger() LOG = logging.getLogger()