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

liniting of new python code

Browse Source
This commit is contained in:
Sarah Hoffmann
2021-01-14 10:19:21 +01:00
parent 98dbc84836
commit 1ff8751caa
3 changed files with 41 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nominatim/admin/exec_utils.py
View File

@@ -1,7 +1,6 @@
""" """
Helper functions for executing external programs. Helper functions for executing external programs.
""" """
from pathlib import Path
import subprocess import subprocess
def run_legacy_script(script, *args, nominatim_env=None, throw_on_fail=False): def run_legacy_script(script, *args, nominatim_env=None, throw_on_fail=False):
@@ -28,4 +27,3 @@ def run_legacy_script(script, *args, nominatim_env=None, throw_on_fail=False):
proc.check_returncode() proc.check_returncode()
return proc.returncode return proc.returncode

27
nominatim/cli.py
View File

@@ -72,7 +72,19 @@ class CommandlineParser:
args.config = Configuration(args.project_dir, args.data_dir / 'settings') args.config = Configuration(args.project_dir, args.data_dir / 'settings')
args.command.run(args) return args.command.run(args)
##### Subcommand classes
#
# Each class needs to implement two functions: add_args() adds the CLI parameters
# for the subfunction, run() executes the subcommand.
#
# The class documentation doubles as the help text for the command. The
# first line is also used in the summary when calling the program without
# a subcommand.
#
# No need to document the functions each time.
# pylint: disable=C0111
class SetupAll: class SetupAll:
@@ -213,7 +225,7 @@ class UpdateReplication:
if args.init: if args.init:
params.append('--init-updates') params.append('--init-updates')
if not args.update_functions: if not args.update_functions:
params.apend('--no-update-functions') params.append('--no-update-functions')
elif args.check_for_updates: elif args.check_for_updates:
params.append('--check-for-updates') params.append('--check-for-updates')
else: else:
@@ -435,11 +447,11 @@ class QueryExport:
if args.restrict_to_country: if args.restrict_to_country:
params.extend(('--restrict-to-country', args.restrict_to_country)) params.extend(('--restrict-to-country', args.restrict_to_country))
if args.restrict_to_osm_node: if args.restrict_to_osm_node:
params.exted(('--restrict-to-osm-node', args.restrict_to_osm_node)) params.extend(('--restrict-to-osm-node', args.restrict_to_osm_node))
if args.restrict_to_osm_way: if args.restrict_to_osm_way:
params.exted(('--restrict-to-osm-way', args.restrict_to_osm_way)) params.extend(('--restrict-to-osm-way', args.restrict_to_osm_way))
if args.restrict_to_osm_relation: if args.restrict_to_osm_relation:
params.exted(('--restrict-to-osm-relation', args.restrict_to_osm_relation)) params.extend(('--restrict-to-osm-relation', args.restrict_to_osm_relation))
return run_legacy_script(*params, nominatim_env=args) return run_legacy_script(*params, nominatim_env=args)
@@ -451,7 +463,8 @@ class QueryTodo:
def add_args(parser): def add_args(parser):
pass pass
def run(args): @staticmethod
def run(args): # pylint: disable=W0613
print("TODO: searching") print("TODO: searching")
@@ -482,4 +495,4 @@ def nominatim(**kwargs):
parser.add_subcommand('details', QueryTodo) parser.add_subcommand('details', QueryTodo)
parser.add_subcommand('status', QueryTodo) parser.add_subcommand('status', QueryTodo)
parser.run(**kwargs) return parser.run(**kwargs)

1
nominatim/config.py
View File

@@ -1,7 +1,6 @@
""" """
Nominatim configuration accessor. Nominatim configuration accessor.
""" """
import sys
import os import os
from dotenv import dotenv_values from dotenv import dotenv_values