Skip to content
This repository was archived by the owner on Dec 26, 2025. It is now read-only.

Commit d326d6b

Browse files
committed
Changed names to dump and load
1 parent b891e3d commit d326d6b

3 files changed

Lines changed: 10 additions & 7 deletions

File tree

src/adif_file/__init__.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,14 +82,17 @@ def unpack(data: str) -> dict:
8282
return unpacked
8383

8484

85-
def adi2dict(adi: str) -> dict:
85+
def loads_adi(adi: str) -> dict:
8686
"""Turn ADI formated string to dictionary
8787
The parameters are converted to uppercase
8888
8989
{
9090
'HEADER': None,
9191
'RECORDS': [list of records]
9292
}
93+
94+
:param adi: the ADI data
95+
:return: the ADI as a dict
9396
"""
9497

9598
doc = {'HEADER': None,
@@ -140,7 +143,7 @@ def pack(param: str, value: str, dtype: str = None) -> str:
140143
return ''
141144

142145

143-
def dict2adi(data_dict: dict, comment: str = 'ADIF export by ' + __proj_name__) -> str:
146+
def dumps_adi(data_dict: dict, comment: str = 'ADIF export by ' + __proj_name__) -> str:
144147
"""Takes a dictionary and converts it to ADI format
145148
Parameters can be in upper or lower case. The output is upper case. The user must take care
146149
that parameters are not doubled!

test/test_dumpadi.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ def test_20_dump_header(self):
4747
<CREATED_TIMESTAMP:4>1234
4848
<EOH>'''
4949

50-
self.assertEqual(exp_hdr, dict2adi(adi_dict))
50+
self.assertEqual(exp_hdr, dumps_adi(adi_dict))
5151

5252
# Test same with udef
5353
adi_udef = [{'dtype': 'E',
@@ -65,7 +65,7 @@ def test_20_dump_header(self):
6565
<EOH>'''
6666

6767
adi_dict['HEADER']['USERDEFS'] = adi_udef
68-
self.assertEqual(exp_hdr_udef, dict2adi(adi_dict))
68+
self.assertEqual(exp_hdr_udef, dumps_adi(adi_dict))
6969

7070
def test_25_dump_records(self):
7171
adi_dict = {
@@ -80,7 +80,7 @@ def test_25_dump_records(self):
8080
<TEST1:5>test3 <TEST2:5>test4
8181
<EOR>'''
8282

83-
self.assertEqual(adi_exp, dict2adi(adi_dict))
83+
self.assertEqual(adi_exp, dumps_adi(adi_dict))
8484

8585

8686
if __name__ == '__main__':

test/test_loadadi.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ def test_50_goodfile(self):
5050
with open(get_file_path('testdata/goodfile.txt'), encoding='ascii') as tf:
5151
adi_txt = tf.read()
5252

53-
adi_dict = adi2dict(adi_txt)
53+
adi_dict = loads_adi(adi_txt)
5454

5555
self.assertIn('HEADER', adi_dict)
5656
self.assertIn('RECORDS', adi_dict)
@@ -61,7 +61,7 @@ def test_55_toomuchheaders(self):
6161
with open(get_file_path('testdata/toomuchheadersfile.txt'), encoding='ascii') as tf:
6262
adi_txt = tf.read()
6363

64-
self.assertRaises(TooMuchHeadersException, adi2dict, adi_txt)
64+
self.assertRaises(TooMuchHeadersException, loads_adi, adi_txt)
6565

6666

6767
if __name__ == '__main__':

0 commit comments

Comments
 (0)