From e39758fde59a77634d46287b8a2ad130411c5c9e Mon Sep 17 00:00:00 2001 From: Chris Mutel Date: Fri, 8 Nov 2024 10:52:06 +0100 Subject: [PATCH] Resolve util func naming discrepancy --- bw2data/backends/base.py | 4 ++-- bw2data/backends/proxies.py | 4 ++-- bw2data/backends/utils.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bw2data/backends/base.py b/bw2data/backends/base.py index 2eef82bb..84bda8fd 100644 --- a/bw2data/backends/base.py +++ b/bw2data/backends/base.py @@ -28,7 +28,7 @@ from bw2data.backends.utils import ( check_exchange, dict_as_activitydataset, - _dict_as_exchangedataset, + dict_as_exchangedataset, get_csv_data_dict, retupleize_geo_strings, ) @@ -525,7 +525,7 @@ def _efficient_write_dataset( if "output" not in exchange: exchange["output"] = (ds["database"], ds["code"]) - exchanges.append(_dict_as_exchangedataset(exchange)) + exchanges.append(dict_as_exchangedataset(exchange)) # Query gets passed as INSERT INTO x VALUES ('?', '?'...) # SQLite3 has a limit of 999 variables, diff --git a/bw2data/backends/proxies.py b/bw2data/backends/proxies.py index 677c01cd..ba085c36 100644 --- a/bw2data/backends/proxies.py +++ b/bw2data/backends/proxies.py @@ -14,7 +14,7 @@ check_exchange_keys, check_exchange_type, ) -from bw2data.backends.utils import dict_as_activitydataset, _dict_as_exchangedataset +from bw2data.backends.utils import dict_as_activitydataset, dict_as_exchangedataset from bw2data.configuration import labels from bw2data.errors import ValidityError from bw2data.logs import stdout_feedback_logger @@ -574,7 +574,7 @@ def save(self, signal: bool = True, data_already_set: bool = False, force_insert check_exchange_type(self._data.get("type")) check_exchange_keys(self) - for key, value in _dict_as_exchangedataset(self._data).items(): + for key, value in dict_as_exchangedataset(self._data).items(): setattr(self._document, key, value) self._document.save(signal=signal, force_insert=force_insert) diff --git a/bw2data/backends/utils.py b/bw2data/backends/utils.py index 3060dab4..0e4a55cd 100644 --- a/bw2data/backends/utils.py +++ b/bw2data/backends/utils.py @@ -85,7 +85,7 @@ def dict_as_activitydataset(ds: Any, add_snowflake_id: bool = False) -> dict: return val -def _dict_as_exchangedataset(ds: Any) -> dict: +def dict_as_exchangedataset(ds: Any) -> dict: return { "data": ds, "input_database": ds["input"][0],