Fix pylint warnings.

.pylintrc

@@ -3,7 +3,7 @@ persistent=no
 extension-pkg-whitelist=lxml
 
 [MESSAGES CONTROL]
-disable=missing-module-docstring,missing-class-docstring,missing-function-docstring,bad-whitespace,invalid-name,line-too-long,redefined-builtin,too-many-statements,too-many-branches,too-many-locals,too-many-arguments,broad-except,consider-using-sys-exit,len-as-condition,no-else-continue,duplicate-code
+disable=missing-module-docstring,missing-class-docstring,missing-function-docstring,bad-whitespace,invalid-name,line-too-long,redefined-builtin,too-many-statements,too-many-branches,too-many-locals,too-many-arguments,broad-except,consider-using-sys-exit,len-as-condition,no-else-continue,duplicate-code,raise-missing-from
 
 [REPORTS]
 output-format=text

enccnf

@@ -133,7 +133,7 @@ def parse_enc_file(enc_file, tftp_certificate_file):
         elif tlv_tag == HEADER_HASH_ALGORITHM:
             hash_algorithm = tlv_data[tlv_index]
 
-            print(f'Digest Algorithm:            ', end = '')
+            print('Digest Algorithm:            ', end = '')
 
             if hash_algorithm == HASH_SHA1:
                 print('SHA1')
@@ -179,7 +179,7 @@ def parse_enc_file(enc_file, tftp_certificate_file):
         elif tlv_tag == HEADER_ENCRYPTION_HASH_ALGORITHM:
             encryption_hash_algorithm = tlv_data[tlv_index]
 
-            print(f'Encryption Digest Algorithm: ', end = '')
+            print('Encryption Digest Algorithm: ', end = '')
 
             if encryption_hash_algorithm == HASH_SHA1:
                 print('SHA1')
@@ -202,7 +202,7 @@ def parse_enc_file(enc_file, tftp_certificate_file):
     print('')
 
     if hash_algorithm is None:
-        raise ProgramError(f'Missing HEADER_HASH_ALGORITHM')
+        raise ProgramError('Missing HEADER_HASH_ALGORITHM')
 
     if hash_algorithm not in (HASH_SHA1, HASH_SHA512):
         raise ProgramError(f'Unsupported HEADER_HASH_ALGORITHM: {hash_algorithm}')
@@ -270,7 +270,7 @@ def remove_enc_file(enc_file, private_key_file):
     if tlv_tag != HEADER_VERSION:
         raise ProgramError(f'Tag is not HEADER_VERSION: {tlv_tag}')
 
-    (major, minor) = struct.unpack_from('B B', tlv_data, tlv_index)
+    # Skip version
     tlv_index += tlv_length
 
     (tlv_tag, tlv_length) = struct.unpack_from('> B H', tlv_data, tlv_index)
@@ -748,7 +748,7 @@ def main():
 
             elif mode == 'remove':
                 if private_key_file is None:
-                    raise ProgramError(f'No private-key file specified')
+                    raise ProgramError('No private-key file specified')
 
                 remove_enc_file(enc_file, private_key_file)
 

sgnfile

@@ -118,7 +118,7 @@ def parse_sgn_file(sgn_file, tftp_certificate_file):
         elif tlv_tag == HEADER_HASH_ALGORITHM:
             hash_algorithm = tlv_data[tlv_index]
 
-            print(f'Digest Algorithm: ', end = '')
+            print('Digest Algorithm: ', end = '')
 
             if hash_algorithm == HASH_SHA1:
                 print('SHA1')
@@ -211,7 +211,7 @@ def remove_sgn_file(sgn_file):
     if tlv_tag != HEADER_VERSION:
         raise ProgramError(f'Tag is not HEADER_VERSION: {tlv_tag}')
 
-    (major, minor) = struct.unpack_from('B B', tlv_data, tlv_index)
+    # Skip version
     tlv_index += tlv_length
 
     (tlv_tag, tlv_length) = struct.unpack_from('> B H', tlv_data, tlv_index)

stripsgn

@@ -36,7 +36,7 @@ def strip_sgn_file(sgn_file):
     if tlv_tag != HEADER_VERSION:
         raise ProgramError(f'Tag is not HEADER_VERSION: {tlv_tag}')
 
-    (major, minor) = struct.unpack_from('B B', tlv_data, tlv_index)
+    # Skip version
     tlv_index += tlv_length
 
     (tlv_tag, tlv_length) = struct.unpack_from('> B H', tlv_data, tlv_index)

tlvfile

@@ -148,7 +148,7 @@ def parse_tlv_file(tlv_file):
         elif tlv_tag == HEADER_HASH_ALGORITHM:
             hash_algorithm = tlv_data[tlv_index]
 
-            print(f'Digest Algorithm: ', end = '')
+            print('Digest Algorithm: ', end = '')
 
             if hash_algorithm == HASH_SHA1:
                 print('SHA1')
@@ -188,10 +188,10 @@ def parse_tlv_file(tlv_file):
     print('')
 
     if sast_serial_number is None:
-        raise ProgramError(f'Missing HEADER_SERIAL_NUMBER')
+        raise ProgramError('Missing HEADER_SERIAL_NUMBER')
 
     if hash_algorithm is None:
-        raise ProgramError(f'Missing HEADER_HASH_ALGORITHM')
+        raise ProgramError('Missing HEADER_HASH_ALGORITHM')
 
     if hash_algorithm not in (HASH_SHA1, HASH_SHA512):
         raise ProgramError(f'Unsupported HEADER_HASH_ALGORITHM: {hash_algorithm}')
@@ -238,7 +238,7 @@ def parse_tlv_file(tlv_file):
             elif tlv_tag == RECORD_ROLE:
                 (role,) = struct.unpack_from('> H', tlv_data, tlv_index)
 
-                print(f'Role:             ', end = '')
+                print('Role:             ', end = '')
 
                 if role == ROLE_SAST:
                     print('SAST')