modernize

masm2c/cli.py

@@ -64,7 +64,7 @@ def parse_args(args):
         "-v",
         "--version",
         action="version",
-        version="{ver}".format(ver=__version__),
+        version=f"{__version__}",
     )
     aparser.add_argument(
         "-d",

masm2c/cpp.py

@@ -21,7 +21,6 @@
 import logging
 import os
 import re
-from builtins import hex, range, str
 from collections import OrderedDict
 
 from lark import lark
@@ -822,8 +821,8 @@ def save_cpp_files(self, fname):
 
         logging.info(f' *** Generating output files in C++ {cpp_fname} {header_fname}')
 
-        cpp_file = open(cpp_fname, "wt", encoding=self.__codeset)
-        hpp_file = open(header_fname, "wt", encoding=self.__codeset)
+        cpp_file = open(cpp_fname, "w", encoding=self.__codeset)
+        hpp_file = open(header_fname, "w", encoding=self.__codeset)
 
         cpp_file.write(f"""{banner}
         #include \"{header_fname}\"
@@ -897,7 +896,7 @@ def write_procedures(self, banner, header_fname):
 
                 cpp_segment_fname = f"{self._namespace.lower()}_{segment}.cpp"
                 logging.info(f' *** Generating output file in C++ {cpp_segment_fname}')
-                cpp_segment_file = open(cpp_segment_fname, "wt", encoding=self.__codeset)
+                cpp_segment_file = open(cpp_segment_fname, "w", encoding=self.__codeset)
                 cpp_segment_file.write(f'''{banner}
 #include "{header_fname}"
 
@@ -954,7 +953,7 @@ def write_data_segments_cpp(self, segments, structures):
         _, data_h, data_cpp_reference, _ = self.render_data_c(segments)
         fname = "_data.cpp"
         header = "_data.h"
-        with open(fname, "wt", encoding=self.__codeset) as fd:
+        with open(fname, "w", encoding=self.__codeset) as fd:
             fd.write(f'''#include "_data.h"
 namespace m2c{{
 
@@ -969,7 +968,7 @@ def write_data_segments_cpp(self, segments, structures):
 
 ''')
 
-        with open(header, "wt", encoding=self.__codeset) as hd:
+        with open(header, "w", encoding=self.__codeset) as hd:
             hd.write('''
 #ifndef ___DATA_H__
 #define ___DATA_H__
@@ -1285,7 +1284,7 @@ def convert_str(self, c):
             elif c == 0:
                 vvv = r"\0"
             elif c < 32:
-                vvv = "\\x{:02x}".format(c)
+                vvv = f"\\x{c:02x}"
             else:
                 vvv = chr(c)
         elif isinstance(c, str):

masm2c/op.py

@@ -18,7 +18,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
-from builtins import str
 from collections import OrderedDict
 from copy import deepcopy
 from enum import Enum

masm2c/parser.py

@@ -25,7 +25,6 @@
 import os
 import re
 import sys
-from builtins import str
 from collections import OrderedDict
 from copy import deepcopy
 
@@ -140,7 +139,7 @@ def read_whole_file(file_name):
     :return: The content of the file.
     """
     logging.info("     Reading file %s...", file_name)
-    with open(file_name, 'rt', encoding="cp437") as file:
+    with open(file_name, encoding="cp437") as file:
         content = file.read()
     return content
 

masm2c/pgparser.py

@@ -4,7 +4,7 @@
 import sys
 from collections import OrderedDict
 from copy import deepcopy, copy
-from typing import Iterator
+from collections.abc import Iterator
 
 from lark import Transformer, Lark, v_args, Discard, Tree, lark
 
@@ -648,7 +648,7 @@ def __new__(cls, *args, **kwargs):
 
             file_name = os.path.dirname(os.path.realpath(__file__)) + "/_masm61.lark"
             debug = True
-            with open(file_name, 'rt') as gr:
+            with open(file_name) as gr:
                 cls._inst.or_parser = Lark(gr, parser='lalr', propagate_positions=True, cache=True, debug=debug,
                                            postlex=MatchTag(context=kwargs['context']), start=['start', 'insegdirlist',
                                                                                                'instruction', 'expr',

masm2c/proc.py

@@ -20,7 +20,6 @@
 #
 import logging
 import re
-from builtins import range, str
 
 from lark import lark
 
@@ -157,7 +156,7 @@ def create_assignment_op(self, label, value, line_number=0):
         return o
 
     def __str__(self):
-        return "\n".join((i.__str__() for i in self.stmts))
+        return "\n".join(i.__str__() for i in self.stmts)
 
     def set_instruction_compare_subclass(self, stmt, full_command, itislst):
         """Sets libdosbox's emulator the instruction subclass