diff options
Diffstat (limited to 'ishtar_common')
| -rw-r--r-- | ishtar_common/tests.py | 8 | ||||
| -rw-r--r-- | ishtar_common/utils.py | 2 | ||||
| -rw-r--r-- | ishtar_common/version.py | 4 |
3 files changed, 12 insertions, 2 deletions
diff --git a/ishtar_common/tests.py b/ishtar_common/tests.py index 92c62295f..b80c91c26 100644 --- a/ishtar_common/tests.py +++ b/ishtar_common/tests.py @@ -190,6 +190,14 @@ class UtilsTest(TestCase): } res = update_data(data_1, data_2) self.assertEqual(res, expected) + data_1 = {"old": {"youpi": {"plouf": "tralalalère"}}} + data_2 = {"tsoin_tsoin": "hop", "old": {"youpi": {"plouf": "nop"}}} + expected = { + "tsoin_tsoin": "hop", + "old": {"youpi": {"plouf": "nop"}} + } + res = update_data(data_1, data_2) + self.assertEqual(res, expected) def test_move_dict_data(self): data = {"old": {"daté": "value"}} diff --git a/ishtar_common/utils.py b/ishtar_common/utils.py index 137f89469..b7a78a226 100644 --- a/ishtar_common/utils.py +++ b/ishtar_common/utils.py @@ -263,6 +263,8 @@ def update_data(data_1, data_2, merge=False): if data_2 and not data_1: return data_2 if not merge: + if data_2: + return data_2 return data_1 if data_2 and data_2 != data_1: return data_1 + " ; " + data_2 diff --git a/ishtar_common/version.py b/ishtar_common/version.py index 6de4cb1d6..021671cc6 100644 --- a/ishtar_common/version.py +++ b/ishtar_common/version.py @@ -1,5 +1,5 @@ -# 3.2.7 -VERSION = (3, 2, 7) +# 3.2.9 +VERSION = (3, 2, 9) def get_version(): |