Removed * import from tests

Author: gitandy

.github/workflows/python-package.yml

@@ -38,7 +38,7 @@ jobs:
         # stop the build if there are Python syntax errors or undefined names
         flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
         # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
-        flake8 ./src/adif_file --count --exit-zero --max-complexity=13 --max-line-length=120 --statistics
+        flake8 . --count --exit-zero --max-complexity=13 --max-line-length=120 --statistics
     - name: Test with pytest
       run: |
         pytest

.github/workflows/python-test.yml

@@ -39,7 +39,7 @@ jobs:
         # stop the build if there are Python syntax errors or undefined names
         flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
         # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
-        flake8 ./src/adif_file --count --exit-zero --max-complexity=13 --max-line-length=120 --statistics
+        flake8 . --count --exit-zero --max-complexity=13 --max-line-length=120 --statistics
     - name: Test with pytest
       run: |
         pytest

test/test_dumpadi.py

@@ -1,37 +1,37 @@
 import os
 import unittest
 
-from adif_file import *
+import adif_file
 
 
 class DumpADI(unittest.TestCase):
     def test_10_pack_header_tag(self):
-        self.assertEqual('<PROGRAMID:8>Testprog', pack('PROGRAMID', 'Testprog'))
-        self.assertEqual('<USERDEF1:4:N>Test', pack('USERDEF1', 'Test', 'N'))
+        self.assertEqual('<PROGRAMID:8>Testprog', adif_file.pack('PROGRAMID', 'Testprog'))
+        self.assertEqual('<USERDEF1:4:N>Test', adif_file.pack('USERDEF1', 'Test', 'N'))
         self.assertEqual('<USERDEF1:19:E>SweaterSize,{S,M,L}',
-                         pack('USERDEF1', 'SweaterSize,{S,M,L}', 'E'))
+                         adif_file.pack('USERDEF1', 'SweaterSize,{S,M,L}', 'E'))
 
-        self.assertRaises(IllegalDataTypeException, pack, 'USERDEF1', 'SweaterSize,{S,M,L}', 'X')
-        self.assertRaises(IllegalDataTypeException, pack, 'USERDEF1', 'SweaterSize,{S,M,L}', 'NN')
+        self.assertRaises(adif_file.IllegalDataTypeException, adif_file.pack, 'USERDEF1', 'SweaterSize,{S,M,L}', 'X')
+        self.assertRaises(adif_file.IllegalDataTypeException, adif_file.pack, 'USERDEF1', 'SweaterSize,{S,M,L}', 'NN')
 
     def test_15_pack_record_tag(self):
-        self.assertEqual('<NAME:5>Joerg', pack('NAME', 'Joerg'))
-        self.assertEqual('<NAME:5>Joerg', pack('name', 'Joerg'))
-        self.assertEqual('<NAME:5>Joerg', pack('Name', 'Joerg'))
-        self.assertEqual('', pack('name_intl', 'Joerg'))
-        self.assertEqual('<APP_TESTAPP_CHANNEL:2:N>24', pack('APP_TESTAPP_CHANNEL', 24, dtype='N'))
+        self.assertEqual('<NAME:5>Joerg', adif_file.pack('NAME', 'Joerg'))
+        self.assertEqual('<NAME:5>Joerg', adif_file.pack('name', 'Joerg'))
+        self.assertEqual('<NAME:5>Joerg', adif_file.pack('Name', 'Joerg'))
+        self.assertEqual('', adif_file.pack('name_intl', 'Joerg'))
+        self.assertEqual('<APP_TESTAPP_CHANNEL:2:N>24', adif_file.pack('APP_TESTAPP_CHANNEL', 24, dtype='N'))
 
-        self.assertEqual('<MY_NAME:5>Peter', pack('MY_Name', 'Peter'))
+        self.assertEqual('<MY_NAME:5>Peter', adif_file.pack('MY_Name', 'Peter'))
 
-        self.assertRaises(StringNotASCIIException, pack, 'NAME', 'Jörg')
-        self.assertRaises(StringNotASCIIException, pack, 'NAME', 'Schloß')
-        self.assertRaises(IllegalParameterException, pack, 'MY_ NAME', 'Peter')
-        self.assertRaises(IllegalParameterException, pack, 'MY~NAME', 'Peter')
+        self.assertRaises(adif_file.StringNotASCIIException, adif_file.pack, 'NAME', 'Jörg')
+        self.assertRaises(adif_file.StringNotASCIIException, adif_file.pack, 'NAME', 'Schloß')
+        self.assertRaises(adif_file.IllegalParameterException, adif_file.pack, 'MY_ NAME', 'Peter')
+        self.assertRaises(adif_file.IllegalParameterException, adif_file.pack, 'MY~NAME', 'Peter')
 
         # noinspection PyTypeChecker
-        self.assertEqual('<DIST:2>99', pack('DIST', 99))
+        self.assertEqual('<DIST:2>99', adif_file.pack('DIST', 99))
         # noinspection PyTypeChecker
-        self.assertEqual('<FREQ:5>0.138', pack('freq', 0.138))
+        self.assertEqual('<FREQ:5>0.138', adif_file.pack('freq', 0.138))
 
     def test_20_dump_header(self):
         adi_dict = {
@@ -48,7 +48,7 @@ def test_20_dump_header(self):
 <CREATED_TIMESTAMP:4>1234
 <EOH>'''
 
-        self.assertEqual(exp_hdr, dumps_adi(adi_dict))
+        self.assertEqual(exp_hdr, adif_file.dumps_adi(adi_dict))
 
         # Test same with udef
         adi_udef = [{'dtype': 'E',
@@ -66,7 +66,7 @@ def test_20_dump_header(self):
 <EOH>'''
 
         adi_dict['HEADER']['USERDEFS'] = adi_udef
-        self.assertEqual(exp_hdr_udef, dumps_adi(adi_dict))
+        self.assertEqual(exp_hdr_udef, adif_file.dumps_adi(adi_dict))
 
     def test_25_dump_records(self):
         adi_dict = {
@@ -81,7 +81,7 @@ def test_25_dump_records(self):
 <TEST1:5>test3 <TEST2:5>test4 
 <EOR>'''
 
-        self.assertEqual(adi_exp, dumps_adi(adi_dict))
+        self.assertEqual(adi_exp, adif_file.dumps_adi(adi_dict))
 
     def test_30_dump_a_file(self):
         adi_dict = {
@@ -110,7 +110,7 @@ def test_30_dump_a_file(self):
 
         temp_file = 'testdata/~test.adi'
 
-        dump_adi(temp_file, adi_dict)
+        adif_file.dump_adi(temp_file, adi_dict)
 
         self.assertTrue(os.path.isfile(temp_file))
 

test/test_loadadi.py

@@ -1,7 +1,7 @@
 import os
 import unittest
 
-from adif_file import *
+import adif_file
 
 
 def get_file_path(file):
@@ -18,8 +18,8 @@ def test_10_unpack_header(self):
     <PROGRAMVERSION:4>v0.2'''
         exp_dict = {'ADIF_VER': '3.1.4', 'PROGRAMID': 'Testprog', 'PROGRAMVERSION': 'v0.2'}
 
-        self.assertDictEqual(exp_dict, unpack(adi_hdr1))
-        self.assertDictEqual(exp_dict, unpack(adi_hdr2))
+        self.assertDictEqual(exp_dict, adif_file.unpack(adi_hdr1))
+        self.assertDictEqual(exp_dict, adif_file.unpack(adi_hdr2))
 
     def test_15_unpack_userdef(self):
         adi_hdr1 = '''ADIF Export by Testprog
@@ -36,26 +36,26 @@ def test_15_unpack_userdef(self):
                                   {'dtype': 'L',
                                    'userdef': 'TestX'}]}
 
-        self.assertDictEqual(exp_dict1, unpack(adi_hdr1))
-        self.assertDictEqual(exp_dict2, unpack(adi_hdr2))
+        self.assertDictEqual(exp_dict1, adif_file.unpack(adi_hdr1))
+        self.assertDictEqual(exp_dict2, adif_file.unpack(adi_hdr2))
 
     def test_20_unpack_record(self):
         adi_rec_app = '<APP_TESTAPP_CHANNEL:2:N>24'
         adi_rec_name = '<NAME:4>Test'
 
-        self.assertDictEqual({'APP_TESTAPP_CHANNEL': '24'}, unpack(adi_rec_app))
-        self.assertDictEqual({'NAME': 'Test'}, unpack(adi_rec_name))
+        self.assertDictEqual({'APP_TESTAPP_CHANNEL': '24'}, adif_file.unpack(adi_rec_app))
+        self.assertDictEqual({'NAME': 'Test'}, adif_file.unpack(adi_rec_name))
 
     def test_50_goodfile(self):
-        adi_dict = load_adi('testdata/goodfile.txt')
+        adi_dict = adif_file.load_adi('testdata/goodfile.txt')
 
         self.assertIn('HEADER', adi_dict)
         self.assertIn('RECORDS', adi_dict)
         self.assertEqual(3, len(adi_dict['HEADER']))
         self.assertEqual(5, len(adi_dict['RECORDS']))
 
     def test_55_toomuchheaders(self):
-        self.assertRaises(TooMuchHeadersException, load_adi, 'testdata/toomuchheadersfile.txt')
+        self.assertRaises(adif_file.TooMuchHeadersException, adif_file.load_adi, 'testdata/toomuchheadersfile.txt')
 
 
 if __name__ == '__main__':