Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

grass.script: Pass environment to message functions #4630

Merged
merged 1 commit into from
Nov 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions python/grass/script/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -1447,7 +1447,7 @@ def list_strings(type, pattern=None, mapset=None, exclude=None, flag="", env=Non
:return: list of elements
"""
if type == "cell":
verbose(_('Element type should be "raster" and not "%s"') % type)
verbose(_('Element type should be "raster" and not "%s"') % type, env=env)

result = []
for line in read_command(
Expand Down Expand Up @@ -1520,7 +1520,9 @@ def list_grouped(
flag += "t"
for i in range(len(types)):
if types[i] == "cell":
verbose(_('Element type should be "raster" and not "%s"') % types[i])
verbose(
_('Element type should be "raster" and not "%s"') % types[i], env=env
)
types[i] = "raster"
result = {}
if check_search_path:
Expand All @@ -1543,7 +1545,7 @@ def list_grouped(
try:
name, mapset = line.split("@")
except ValueError:
warning(_("Invalid element '%s'") % line)
warning(_("Invalid element '%s'") % line, env=env)
continue

if store_types:
Expand Down Expand Up @@ -1701,7 +1703,7 @@ def mapsets(search_path=False, env=None):
flags = "p" if search_path else "l"
mapsets = read_command("g.mapsets", flags=flags, sep="newline", quiet=True, env=env)
if not mapsets:
fatal(_("Unable to list mapsets"))
fatal(_("Unable to list mapsets"), env=env)

return mapsets.splitlines()

Expand Down
7 changes: 4 additions & 3 deletions python/grass/script/db.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ def db_describe(table, env=None, **args):
args.pop("driver")
s = read_command("db.describe", flags="c", table=table, env=env, **args)
if not s:
fatal(_("Unable to describe table <%s>") % table)
fatal(_("Unable to describe table <%s>") % table, env=env)

cols = []
result = {}
Expand Down Expand Up @@ -179,7 +179,8 @@ def db_select(sql=None, filename=None, table=None, env=None, **args):
"Programmer error: '%(sql)s', '%(filename)s', or '%(table)s' must be \
provided"
)
% {"sql": "sql", "filename": "filename", "table": "table"}
% {"sql": "sql", "filename": "filename", "table": "table"},
env=env,
)

if "sep" not in args:
Expand All @@ -188,7 +189,7 @@ def db_select(sql=None, filename=None, table=None, env=None, **args):
try:
run_command("db.select", quiet=True, flags="c", output=fname, env=env, **args)
except CalledModuleError:
fatal(_("Fetching data failed"))
fatal(_("Fetching data failed"), env=env)

ofile = open(fname)
result = [tuple(x.rstrip(os.linesep).split(args["sep"])) for x in ofile]
Expand Down
8 changes: 6 additions & 2 deletions python/grass/script/raster.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,8 @@ def raster_history(map, overwrite=False, env=None):
"Unable to write history for <%(map)s>. "
"Raster map <%(map)s> not found in current mapset."
)
% {"map": map}
% {"map": map},
env=env,
)
return False

Expand Down Expand Up @@ -143,7 +144,10 @@ def mapcalc(
overwrite=overwrite,
)
except CalledModuleError:
fatal(_("An error occurred while running r.mapcalc with expression: %s") % e)
fatal(
_("An error occurred while running r.mapcalc with expression: %s") % e,
env=env,
)


def mapcalc_start(
Expand Down
5 changes: 4 additions & 1 deletion python/grass/script/raster3d.py
Original file line number Diff line number Diff line change
Expand Up @@ -108,4 +108,7 @@ def mapcalc3d(
overwrite=overwrite,
)
except CalledModuleError:
fatal(_("An error occurred while running r3.mapcalc with expression: %s") % e)
fatal(
_("An error occurred while running r3.mapcalc with expression: %s") % e,
env=env,
)
9 changes: 5 additions & 4 deletions python/grass/script/vector.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ def vector_layer_db(map, layer, env=None):
try:
f = vector_db(map, env=env)[int(layer)]
except KeyError:
fatal(_("Database connection not defined for layer %s") % layer)
fatal(_("Database connection not defined for layer %s") % layer, env=env)

return f

Expand Down Expand Up @@ -250,7 +250,8 @@ def vector_db_select(map, layer=1, env=None, **kwargs):
except KeyError:
error(
_("Missing layer %(layer)d in vector map <%(map)s>")
% {"layer": layer, "map": map}
% {"layer": layer, "map": map},
env=env,
)
return {"columns": [], "values": {}}

Expand All @@ -259,13 +260,13 @@ def vector_db_select(map, layer=1, env=None, **kwargs):
if key not in kwargs["columns"].split(","):
# add key column if missing
include_key = False
debug("Adding key column to the output")
debug("Adding key column to the output", env=env)
kwargs["columns"] += "," + key

ret = read_command("v.db.select", map=map, layer=layer, env=env, **kwargs)

if not ret:
error(_("vector_db_select() failed"))
error(_("vector_db_select() failed"), env=env)
return {"columns": [], "values": {}}

columns = []
Expand Down
Loading