diff --git a/Autocoders/Python/bin/codegen.py b/Autocoders/Python/bin/codegen.py index 137cf1198e..cc50efbc91 100755 --- a/Autocoders/Python/bin/codegen.py +++ b/Autocoders/Python/bin/codegen.py @@ -1145,7 +1145,7 @@ def generate_dependency_file(filename, target_file, subst_path, parser, the_type # get list of dependency files from XML/header file list file_list_tmp = list(parser.get_comp_type_file_header_dict().keys()) file_list = file_list_tmp - # file_list = list() + # file_list = [] # for f in file_list_tmp: # file_list.append(f.replace("Ai.xml","Ac.hpp")) else: diff --git a/Autocoders/Python/bin/tlm_packet_gen.py b/Autocoders/Python/bin/tlm_packet_gen.py index d5b4294b24..cd48cb90dc 100755 --- a/Autocoders/Python/bin/tlm_packet_gen.py +++ b/Autocoders/Python/bin/tlm_packet_gen.py @@ -303,18 +303,18 @@ def gen_packet_file(self, xml_filename): it.packet_list_namespace = list_namespace it.max_size = max_size - packet_list_container = list() + packet_list_container = [] - packetized_channel_list = list() - it.ignore_list = list() - id_list = list() # check for duplicates - ignore_name_list = list() + packetized_channel_list = [] + it.ignore_list = [] + id_list = [] # check for duplicates + ignore_name_list = [] size_dict = dict() ht.num_packets = 0 total_packet_size = 0 - levels = list() + levels = [] view_path = "./Views" # find the topology import for entry in element_tree.getroot(): @@ -354,7 +354,7 @@ def gen_packet_file(self, xml_filename): else: id_list.append(packet_id) - channel_list = list() + channel_list = [] for channel in entry: channel_name = channel.attrib["name"] if not channel_name in channel_size_dict: diff --git a/Autocoders/Python/src/fprime_ac/generators/ChannelBody.py b/Autocoders/Python/src/fprime_ac/generators/ChannelBody.py index 5fbf68b322..c84a65f632 100644 --- a/Autocoders/Python/src/fprime_ac/generators/ChannelBody.py +++ b/Autocoders/Python/src/fprime_ac/generators/ChannelBody.py @@ -52,7 +52,7 @@ def __init__(self): """ Constructor. """ - self.__visitor_list = list() + self.__visitor_list = [] def __call__(self, args): """ diff --git a/Autocoders/Python/src/fprime_ac/generators/ChannelHeader.py b/Autocoders/Python/src/fprime_ac/generators/ChannelHeader.py index 33953c3ec4..73c8b33eac 100644 --- a/Autocoders/Python/src/fprime_ac/generators/ChannelHeader.py +++ b/Autocoders/Python/src/fprime_ac/generators/ChannelHeader.py @@ -52,7 +52,7 @@ def __init__(self): """ Constructor. """ - self.__visitor_list = list() + self.__visitor_list = [] def __call__(self, args): """ diff --git a/Autocoders/Python/src/fprime_ac/generators/CommandBody.py b/Autocoders/Python/src/fprime_ac/generators/CommandBody.py index c41c0aa5b6..f37b5c57f1 100644 --- a/Autocoders/Python/src/fprime_ac/generators/CommandBody.py +++ b/Autocoders/Python/src/fprime_ac/generators/CommandBody.py @@ -52,7 +52,7 @@ def __init__(self): """ Constructor. """ - self.__visitor_list = list() + self.__visitor_list = [] def __call__(self, args): """ diff --git a/Autocoders/Python/src/fprime_ac/generators/CommandHeader.py b/Autocoders/Python/src/fprime_ac/generators/CommandHeader.py index bfa01df251..cadd440263 100644 --- a/Autocoders/Python/src/fprime_ac/generators/CommandHeader.py +++ b/Autocoders/Python/src/fprime_ac/generators/CommandHeader.py @@ -52,7 +52,7 @@ def __init__(self): """ Constructor. """ - self.__visitor_list = list() + self.__visitor_list = [] def __call__(self, args): """ diff --git a/Autocoders/Python/src/fprime_ac/generators/DictBody.py b/Autocoders/Python/src/fprime_ac/generators/DictBody.py index c5c07ffcd1..bc81dc69f4 100644 --- a/Autocoders/Python/src/fprime_ac/generators/DictBody.py +++ b/Autocoders/Python/src/fprime_ac/generators/DictBody.py @@ -52,7 +52,7 @@ def __init__(self): """ Constructor. """ - self.__visitor_list = list() + self.__visitor_list = [] def __call__(self, args): """ diff --git a/Autocoders/Python/src/fprime_ac/generators/DictHeader.py b/Autocoders/Python/src/fprime_ac/generators/DictHeader.py index 2593741e57..1727cb3d74 100644 --- a/Autocoders/Python/src/fprime_ac/generators/DictHeader.py +++ b/Autocoders/Python/src/fprime_ac/generators/DictHeader.py @@ -52,7 +52,7 @@ def __init__(self): """ Constructor. """ - self.__visitor_list = list() + self.__visitor_list = [] def __call__(self, args): """ diff --git a/Autocoders/Python/src/fprime_ac/generators/DictStart.py b/Autocoders/Python/src/fprime_ac/generators/DictStart.py index 6a711d297f..6cb18a921b 100644 --- a/Autocoders/Python/src/fprime_ac/generators/DictStart.py +++ b/Autocoders/Python/src/fprime_ac/generators/DictStart.py @@ -52,7 +52,7 @@ def __init__(self): """ Constructor. """ - self.__visitor_list = list() + self.__visitor_list = [] def __call__(self, args): """ diff --git a/Autocoders/Python/src/fprime_ac/generators/EventBody.py b/Autocoders/Python/src/fprime_ac/generators/EventBody.py index 4099d4e000..847ffa4547 100644 --- a/Autocoders/Python/src/fprime_ac/generators/EventBody.py +++ b/Autocoders/Python/src/fprime_ac/generators/EventBody.py @@ -52,7 +52,7 @@ def __init__(self): """ Constructor. """ - self.__visitor_list = list() + self.__visitor_list = [] def __call__(self, args): """ diff --git a/Autocoders/Python/src/fprime_ac/generators/EventHeader.py b/Autocoders/Python/src/fprime_ac/generators/EventHeader.py index 27abe488a7..b431c9ed7d 100644 --- a/Autocoders/Python/src/fprime_ac/generators/EventHeader.py +++ b/Autocoders/Python/src/fprime_ac/generators/EventHeader.py @@ -52,7 +52,7 @@ def __init__(self): """ Constructor. """ - self.__visitor_list = list() + self.__visitor_list = [] def __call__(self, args): """ diff --git a/Autocoders/Python/src/fprime_ac/generators/FinishSource.py b/Autocoders/Python/src/fprime_ac/generators/FinishSource.py index 50513e15c7..352fbe402f 100644 --- a/Autocoders/Python/src/fprime_ac/generators/FinishSource.py +++ b/Autocoders/Python/src/fprime_ac/generators/FinishSource.py @@ -52,7 +52,7 @@ def __init__(self): """ Constructor. """ - self.__visitor_list = list() + self.__visitor_list = [] def __call__(self, args): """ diff --git a/Autocoders/Python/src/fprime_ac/generators/GenFactory.py b/Autocoders/Python/src/fprime_ac/generators/GenFactory.py index dee060e736..9f74de4cd3 100644 --- a/Autocoders/Python/src/fprime_ac/generators/GenFactory.py +++ b/Autocoders/Python/src/fprime_ac/generators/GenFactory.py @@ -350,7 +350,7 @@ def _buildVisitorList(self): """ # Instance this list only once for all elements if self.__visitor_list is None: - self.__visitor_list = list() + self.__visitor_list = [] # # Insert each of the code producer visitors into the list of # visitors. The visitor must be in the list of diff --git a/Autocoders/Python/src/fprime_ac/generators/HtmlDocPage.py b/Autocoders/Python/src/fprime_ac/generators/HtmlDocPage.py index 32267e1d6d..943ef39021 100644 --- a/Autocoders/Python/src/fprime_ac/generators/HtmlDocPage.py +++ b/Autocoders/Python/src/fprime_ac/generators/HtmlDocPage.py @@ -52,7 +52,7 @@ def __init__(self): """ Constructor. """ - self.__visitor_list = list() + self.__visitor_list = [] def __call__(self, args): """ diff --git a/Autocoders/Python/src/fprime_ac/generators/HtmlStartPage.py b/Autocoders/Python/src/fprime_ac/generators/HtmlStartPage.py index 1272ed8346..081ff24abc 100644 --- a/Autocoders/Python/src/fprime_ac/generators/HtmlStartPage.py +++ b/Autocoders/Python/src/fprime_ac/generators/HtmlStartPage.py @@ -52,7 +52,7 @@ def __init__(self): """ Constructor. """ - self.__visitor_list = list() + self.__visitor_list = [] def __call__(self, args): """ diff --git a/Autocoders/Python/src/fprime_ac/generators/Includes1.py b/Autocoders/Python/src/fprime_ac/generators/Includes1.py index b1d664bfd5..c246ecc4e5 100644 --- a/Autocoders/Python/src/fprime_ac/generators/Includes1.py +++ b/Autocoders/Python/src/fprime_ac/generators/Includes1.py @@ -52,7 +52,7 @@ def __init__(self): """ Constructor. """ - self.__visitor_list = list() + self.__visitor_list = [] def __call__(self, args): """ diff --git a/Autocoders/Python/src/fprime_ac/generators/Includes2.py b/Autocoders/Python/src/fprime_ac/generators/Includes2.py index dc29993abb..7cfda5f929 100644 --- a/Autocoders/Python/src/fprime_ac/generators/Includes2.py +++ b/Autocoders/Python/src/fprime_ac/generators/Includes2.py @@ -52,7 +52,7 @@ def __init__(self): """ Constructor. """ - self.__visitor_list = list() + self.__visitor_list = [] def __call__(self, args): """ diff --git a/Autocoders/Python/src/fprime_ac/generators/InitFiles.py b/Autocoders/Python/src/fprime_ac/generators/InitFiles.py index f0d42d9896..4cc1eadc69 100644 --- a/Autocoders/Python/src/fprime_ac/generators/InitFiles.py +++ b/Autocoders/Python/src/fprime_ac/generators/InitFiles.py @@ -53,7 +53,7 @@ def __init__(self): """ Constructor. """ - self.__visitor_list = list() + self.__visitor_list = [] def __call__(self, args): """ diff --git a/Autocoders/Python/src/fprime_ac/generators/InstanceDictBody.py b/Autocoders/Python/src/fprime_ac/generators/InstanceDictBody.py index f18221bf3f..dc12163270 100644 --- a/Autocoders/Python/src/fprime_ac/generators/InstanceDictBody.py +++ b/Autocoders/Python/src/fprime_ac/generators/InstanceDictBody.py @@ -52,7 +52,7 @@ def __init__(self): """ Constructor. """ - self.__visitor_list = list() + self.__visitor_list = [] def __call__(self, args, topology_model): """ diff --git a/Autocoders/Python/src/fprime_ac/generators/InstanceDictHeader.py b/Autocoders/Python/src/fprime_ac/generators/InstanceDictHeader.py index bc7cd584bd..b1098e42c7 100644 --- a/Autocoders/Python/src/fprime_ac/generators/InstanceDictHeader.py +++ b/Autocoders/Python/src/fprime_ac/generators/InstanceDictHeader.py @@ -52,7 +52,7 @@ def __init__(self): """ Constructor. """ - self.__visitor_list = list() + self.__visitor_list = [] def __call__(self, args, topology_model): """ diff --git a/Autocoders/Python/src/fprime_ac/generators/InstanceDictStart.py b/Autocoders/Python/src/fprime_ac/generators/InstanceDictStart.py index 3f2787b77f..1430de5c39 100644 --- a/Autocoders/Python/src/fprime_ac/generators/InstanceDictStart.py +++ b/Autocoders/Python/src/fprime_ac/generators/InstanceDictStart.py @@ -52,7 +52,7 @@ def __init__(self): """ Constructor. """ - self.__visitor_list = list() + self.__visitor_list = [] def __call__(self, args, topology_model): """ diff --git a/Autocoders/Python/src/fprime_ac/generators/MdDocPage.py b/Autocoders/Python/src/fprime_ac/generators/MdDocPage.py index ffda618a7e..3f35ab27db 100644 --- a/Autocoders/Python/src/fprime_ac/generators/MdDocPage.py +++ b/Autocoders/Python/src/fprime_ac/generators/MdDocPage.py @@ -52,7 +52,7 @@ def __init__(self): """ Constructor. """ - self.__visitor_list = list() + self.__visitor_list = [] def __call__(self, args): """ diff --git a/Autocoders/Python/src/fprime_ac/generators/MdStartPage.py b/Autocoders/Python/src/fprime_ac/generators/MdStartPage.py index a601adfd16..09a91fd1b2 100644 --- a/Autocoders/Python/src/fprime_ac/generators/MdStartPage.py +++ b/Autocoders/Python/src/fprime_ac/generators/MdStartPage.py @@ -52,7 +52,7 @@ def __init__(self): """ Constructor. """ - self.__visitor_list = list() + self.__visitor_list = [] def __call__(self, args): """ diff --git a/Autocoders/Python/src/fprime_ac/generators/Namespace.py b/Autocoders/Python/src/fprime_ac/generators/Namespace.py index a3e1b63475..da5c08ded2 100644 --- a/Autocoders/Python/src/fprime_ac/generators/Namespace.py +++ b/Autocoders/Python/src/fprime_ac/generators/Namespace.py @@ -53,7 +53,7 @@ def __init__(self): """ Constructor. """ - self.__visitor_list = list() + self.__visitor_list = [] def __call__(self, args): """ diff --git a/Autocoders/Python/src/fprime_ac/generators/Private.py b/Autocoders/Python/src/fprime_ac/generators/Private.py index caecd3cbc8..1708128d1f 100644 --- a/Autocoders/Python/src/fprime_ac/generators/Private.py +++ b/Autocoders/Python/src/fprime_ac/generators/Private.py @@ -52,7 +52,7 @@ def __init__(self): """ Constructor. """ - self.__visitor_list = list() + self.__visitor_list = [] def __call__(self, args): """ diff --git a/Autocoders/Python/src/fprime_ac/generators/Protected.py b/Autocoders/Python/src/fprime_ac/generators/Protected.py index 5d0e28d689..d553a52090 100644 --- a/Autocoders/Python/src/fprime_ac/generators/Protected.py +++ b/Autocoders/Python/src/fprime_ac/generators/Protected.py @@ -52,7 +52,7 @@ def __init__(self): """ Constructor. """ - self.__visitor_list = list() + self.__visitor_list = [] def __call__(self, args): """ diff --git a/Autocoders/Python/src/fprime_ac/generators/Public.py b/Autocoders/Python/src/fprime_ac/generators/Public.py index e9d5cdae4a..7a03cb02d4 100644 --- a/Autocoders/Python/src/fprime_ac/generators/Public.py +++ b/Autocoders/Python/src/fprime_ac/generators/Public.py @@ -52,7 +52,7 @@ def __init__(self): """ Constructor. """ - self.__visitor_list = list() + self.__visitor_list = [] def __call__(self, args): """ diff --git a/Autocoders/Python/src/fprime_ac/generators/StartChannel.py b/Autocoders/Python/src/fprime_ac/generators/StartChannel.py index 420fb37756..5c6939ac79 100644 --- a/Autocoders/Python/src/fprime_ac/generators/StartChannel.py +++ b/Autocoders/Python/src/fprime_ac/generators/StartChannel.py @@ -52,7 +52,7 @@ def __init__(self): """ Constructor. """ - self.__visitor_list = list() + self.__visitor_list = [] def __call__(self, args): """ diff --git a/Autocoders/Python/src/fprime_ac/generators/StartCommand.py b/Autocoders/Python/src/fprime_ac/generators/StartCommand.py index 820d5e73b7..53a3a5496c 100644 --- a/Autocoders/Python/src/fprime_ac/generators/StartCommand.py +++ b/Autocoders/Python/src/fprime_ac/generators/StartCommand.py @@ -52,7 +52,7 @@ def __init__(self): """ Constructor. """ - self.__visitor_list = list() + self.__visitor_list = [] def __call__(self, args): """ diff --git a/Autocoders/Python/src/fprime_ac/generators/StartEvent.py b/Autocoders/Python/src/fprime_ac/generators/StartEvent.py index 8f927faccb..fa4c3e3f12 100644 --- a/Autocoders/Python/src/fprime_ac/generators/StartEvent.py +++ b/Autocoders/Python/src/fprime_ac/generators/StartEvent.py @@ -52,7 +52,7 @@ def __init__(self): """ Constructor. """ - self.__visitor_list = list() + self.__visitor_list = [] def __call__(self, args): """ diff --git a/Autocoders/Python/src/fprime_ac/generators/StartSource.py b/Autocoders/Python/src/fprime_ac/generators/StartSource.py index 823345bb27..88d511a2f0 100644 --- a/Autocoders/Python/src/fprime_ac/generators/StartSource.py +++ b/Autocoders/Python/src/fprime_ac/generators/StartSource.py @@ -53,7 +53,7 @@ def __init__(self): """ Constructor. """ - self.__visitor_list = list() + self.__visitor_list = [] def __call__(self, args): """ diff --git a/Autocoders/Python/src/fprime_ac/generators/formatters.py b/Autocoders/Python/src/fprime_ac/generators/formatters.py index d8c34631c9..f5e49146bd 100644 --- a/Autocoders/Python/src/fprime_ac/generators/formatters.py +++ b/Autocoders/Python/src/fprime_ac/generators/formatters.py @@ -59,7 +59,7 @@ def _strip_without_code(self, line_list): the first @code is stripped off each line. """ - new_line_list = list() + new_line_list = [] code_flag = False @@ -140,7 +140,7 @@ def _wrapText(self, text, indent, prefix, width=70): returned. """ - out = list() + out = [] width = width - indent @@ -720,7 +720,7 @@ def opcodeStemNameValidate(self, id, cmd_name_list): @param cmd_name_list: list of command function names. @return: TRUE if all command stem names are unique, else raise an exception. """ - cmds = list() + cmds = [] for c in cmd_name_list: cmds.append(self.opcodeStemName(id, c)) @@ -896,8 +896,8 @@ def simpleFuncDraw(self, name, args, proto=True, indent=0): # one argument. A one argument function is built on one line. All # other numbers of arguments will use multiple lines. - arg_list = list() - type_list = list() + arg_list = [] + type_list = [] for arg in args: @@ -977,9 +977,9 @@ def formatFunComment(self, name, args, proto=True, ident=0): fname = name.strip() - arg_list = list() - type_list = list() - comment_list = list() + arg_list = [] + type_list = [] + comment_list = [] # Get the no argument case out of the way -- just add void argument. if len(args) == 0: @@ -1007,7 +1007,7 @@ def formatFunComment(self, name, args, proto=True, ident=0): type_args_list = self.argStringAlign(type_list, arg_list, pad) - new_list = list() + new_list = [] for line in type_args_list[:-1]: new_list.append(line + ",") if proto == True: @@ -1216,7 +1216,7 @@ def argStringAlign(self, type_list, arg_list, pad_spaces=4): @return str_list: a list of strings with args aligned. """ - str_list = list() + str_list = [] if len(type_list) > 0: @@ -1261,9 +1261,9 @@ def argTypedefStringAlign(self, args): @param args: list of tuple args from xml. """ - type_list = list() - arg_list = list() - comment_list = list() + type_list = [] + arg_list = [] + comment_list = [] for arg in args: # EGB pass by pointer: This is to allow pointers to be passed directly via IPC @@ -1388,7 +1388,7 @@ def argFilter(self, module, args, name="foo"): Changes the STRING to a U8 for use as U8 array. Changes the SCLK to ModArgSclk struct type of U32, U16. """ - new_args = list() + new_args = [] for arg in args: id, type, comment, array_max, array_len, range_list, enum_type_list = arg[ 0:7 diff --git a/Autocoders/Python/src/fprime_ac/generators/visitors/ChannelVisitor.py b/Autocoders/Python/src/fprime_ac/generators/visitors/ChannelVisitor.py index 1398e4261b..4d691bb177 100644 --- a/Autocoders/Python/src/fprime_ac/generators/visitors/ChannelVisitor.py +++ b/Autocoders/Python/src/fprime_ac/generators/visitors/ChannelVisitor.py @@ -94,7 +94,7 @@ def DictStartVisit(self, obj): if not (os.path.isdir(output_dir)): os.makedirs(output_dir) - self.__fp = list() + self.__fp = [] if len(obj.get_ids()) == 1: pyfile = "{}/{}.py".format(output_dir, obj.get_name()) diff --git a/Autocoders/Python/src/fprime_ac/generators/visitors/CommandVisitor.py b/Autocoders/Python/src/fprime_ac/generators/visitors/CommandVisitor.py index 018c653ba1..3969d47a4f 100644 --- a/Autocoders/Python/src/fprime_ac/generators/visitors/CommandVisitor.py +++ b/Autocoders/Python/src/fprime_ac/generators/visitors/CommandVisitor.py @@ -103,7 +103,7 @@ def DictStartVisit(self, obj): # multi-instance component. If there is only # one instance, use the opcode directly. # Otherwise, it will be the opcode + instance - self.__fp1 = list() + self.__fp1 = [] if len(obj.get_opcodes()) == 1: pyfile = "{}/{}.py".format(output_dir, obj.get_mnemonic()) @@ -123,8 +123,8 @@ def DictStartVisit(self, obj): DEBUG.info("Completed %s open" % pyfile) self.__fp1.append(fd) elif type(obj) is Parameter.Parameter: - self.__fp1 = list() - self.__fp2 = list() + self.__fp1 = [] + self.__fp2 = [] # Command stem will be component name minus namespace converted to uppercase self.__stem = obj.get_name().upper() @@ -227,8 +227,8 @@ def DictBodyVisit(self, obj): c.description = obj.get_comment() c.component = obj.get_component_name() - c.arglist = list() - c.ser_import_list = list() + c.arglist = [] + c.ser_import_list = [] for arg_obj in obj.get_args(): # convert XML types to Python classes @@ -262,8 +262,8 @@ def DictBodyVisit(self, obj): c.description = obj.get_comment() c.component = obj.get_component_name() - c.arglist = list() - c.ser_import_list = list() + c.arglist = [] + c.ser_import_list = [] # convert XML types to Python classes ( @@ -293,8 +293,8 @@ def DictBodyVisit(self, obj): c.description = obj.get_comment() c.component = obj.get_component_name() - c.arglist = list() - c.ser_import_list = list() + c.arglist = [] + c.ser_import_list = [] self._writeTmpl(c, self.__fp2[inst], "commandBodyVisit") self.__fp2[inst].close() diff --git a/Autocoders/Python/src/fprime_ac/generators/visitors/ComponentVisitorBase.py b/Autocoders/Python/src/fprime_ac/generators/visitors/ComponentVisitorBase.py index 696197fdf6..25bb1230b5 100644 --- a/Autocoders/Python/src/fprime_ac/generators/visitors/ComponentVisitorBase.py +++ b/Autocoders/Python/src/fprime_ac/generators/visitors/ComponentVisitorBase.py @@ -383,7 +383,7 @@ def g(xxx_todo_changeme3): if len(opcodes) == 1: return "CMD_" + mnemonic.upper() else: - mlist = list() + mlist = [] inst = 0 for opcode in opcodes: mlist.append("CMD_" + mnemonic.upper() + "_%d" % inst) @@ -442,7 +442,7 @@ def initPortFlags(self, obj, c): c.has_time_get = "TimeGet" in roles def initPortIncludes(self, obj, c): - c.port_includes = list() + c.port_includes = [] for include in self.__model_parser.uniqueList(obj.get_xml_port_files()): c.port_includes.append(include.replace("PortAi.xml", "PortAc.hpp")) diff --git a/Autocoders/Python/src/fprime_ac/generators/visitors/EventVisitor.py b/Autocoders/Python/src/fprime_ac/generators/visitors/EventVisitor.py index 6c6bee8844..fb9e76c2b9 100644 --- a/Autocoders/Python/src/fprime_ac/generators/visitors/EventVisitor.py +++ b/Autocoders/Python/src/fprime_ac/generators/visitors/EventVisitor.py @@ -96,7 +96,7 @@ def DictStartVisit(self, obj): if not (os.path.isdir(output_dir)): os.makedirs(output_dir) - self.__fp = list() + self.__fp = [] if len(obj.get_ids()) == 1: pyfile = "{}/{}.py".format(output_dir, obj.get_name()) @@ -149,8 +149,8 @@ def DictBodyVisit(self, obj): c.description = obj.get_comment() c.component = obj.get_component_name() - c.arglist = list() - c.ser_import_list = list() + c.arglist = [] + c.ser_import_list = [] arg_num = 0 for arg_obj in obj.get_args(): diff --git a/Autocoders/Python/src/fprime_ac/generators/visitors/InstanceCommandVisitor.py b/Autocoders/Python/src/fprime_ac/generators/visitors/InstanceCommandVisitor.py index 1b26e744a5..32243f726c 100644 --- a/Autocoders/Python/src/fprime_ac/generators/visitors/InstanceCommandVisitor.py +++ b/Autocoders/Python/src/fprime_ac/generators/visitors/InstanceCommandVisitor.py @@ -257,8 +257,8 @@ def DictBodyVisit(self, obj, topology_model): c.description = obj.get_comment() c.component = obj.get_component_name() - c.arglist = list() - c.ser_import_list = list() + c.arglist = [] + c.ser_import_list = [] for arg_obj in obj.get_args(): # convert XML types to Python classes @@ -305,8 +305,8 @@ def DictBodyVisit(self, obj, topology_model): c.description = obj.get_comment() c.component = obj.get_component_name() - c.arglist = list() - c.ser_import_list = list() + c.arglist = [] + c.ser_import_list = [] # convert XML types to Python classes ( @@ -347,8 +347,8 @@ def DictBodyVisit(self, obj, topology_model): c.description = obj.get_comment() c.component = obj.get_component_name() - c.arglist = list() - c.ser_import_list = list() + c.arglist = [] + c.ser_import_list = [] self._writeTmpl(c, self.__fp2[fname], "commandBodyVisit") self.__fp2[fname].close() diff --git a/Autocoders/Python/src/fprime_ac/generators/visitors/InstanceEventVisitor.py b/Autocoders/Python/src/fprime_ac/generators/visitors/InstanceEventVisitor.py index 765573ad66..41b82789a0 100644 --- a/Autocoders/Python/src/fprime_ac/generators/visitors/InstanceEventVisitor.py +++ b/Autocoders/Python/src/fprime_ac/generators/visitors/InstanceEventVisitor.py @@ -194,8 +194,8 @@ def DictBodyVisit(self, obj, topology_model): c.description = obj.get_comment() c.component = obj.get_component_name() - c.arglist = list() - c.ser_import_list = list() + c.arglist = [] + c.ser_import_list = [] arg_num = 0 for arg_obj in obj.get_args(): diff --git a/Autocoders/Python/src/fprime_ac/generators/visitors/InstanceSerializableVisitor.py b/Autocoders/Python/src/fprime_ac/generators/visitors/InstanceSerializableVisitor.py index 46650a3a23..acd86f1c0b 100644 --- a/Autocoders/Python/src/fprime_ac/generators/visitors/InstanceSerializableVisitor.py +++ b/Autocoders/Python/src/fprime_ac/generators/visitors/InstanceSerializableVisitor.py @@ -107,7 +107,7 @@ def _get_conv_mem_list(self, obj): """ Return a list of port argument tuples """ - arg_list = list() + arg_list = [] for (name, mtype, size, format, comment) in obj.get_members(): typeinfo = None @@ -227,7 +227,7 @@ def publicVisit(self, obj): """ c = SerialBody.SerialBody() c.name = obj.get_name() - c.mem_list = list() + c.mem_list = [] for (n, t, s, f, comment) in obj.get_members(): # convert XML types to Python classes ( diff --git a/Autocoders/Python/src/fprime_ac/generators/visitors/PortCppVisitor.py b/Autocoders/Python/src/fprime_ac/generators/visitors/PortCppVisitor.py index 55e6edcc76..1665db7992 100644 --- a/Autocoders/Python/src/fprime_ac/generators/visitors/PortCppVisitor.py +++ b/Autocoders/Python/src/fprime_ac/generators/visitors/PortCppVisitor.py @@ -139,7 +139,7 @@ def _get_args_list(self, obj): """ Return a list of port argument tuples """ - arg_list = list() + arg_list = [] for arg in obj.get_args(): n = arg.get_name() diff --git a/Autocoders/Python/src/fprime_ac/generators/visitors/PortHVisitor.py b/Autocoders/Python/src/fprime_ac/generators/visitors/PortHVisitor.py index 1be3e8cb0b..377d93fac9 100644 --- a/Autocoders/Python/src/fprime_ac/generators/visitors/PortHVisitor.py +++ b/Autocoders/Python/src/fprime_ac/generators/visitors/PortHVisitor.py @@ -199,7 +199,7 @@ def _get_args_list(self, obj): """ Return a list of port argument tuples """ - arg_list = list() + arg_list = [] for arg in obj.get_args(): n = arg.get_name() diff --git a/Autocoders/Python/src/fprime_ac/generators/visitors/SerialCppVisitor.py b/Autocoders/Python/src/fprime_ac/generators/visitors/SerialCppVisitor.py index 77eb8a7f79..38360ff291 100644 --- a/Autocoders/Python/src/fprime_ac/generators/visitors/SerialCppVisitor.py +++ b/Autocoders/Python/src/fprime_ac/generators/visitors/SerialCppVisitor.py @@ -138,7 +138,7 @@ def _get_conv_mem_list(self, obj): """ Return a list of struct member tuples """ - arg_list = list() + arg_list = [] for ( name, diff --git a/Autocoders/Python/src/fprime_ac/generators/visitors/SerialHVisitor.py b/Autocoders/Python/src/fprime_ac/generators/visitors/SerialHVisitor.py index 8cd7cb7846..8aa37c92ba 100644 --- a/Autocoders/Python/src/fprime_ac/generators/visitors/SerialHVisitor.py +++ b/Autocoders/Python/src/fprime_ac/generators/visitors/SerialHVisitor.py @@ -157,7 +157,7 @@ def _get_conv_mem_list(self, obj): """ Return a list of port argument tuples """ - arg_list = list() + arg_list = [] for ( name, diff --git a/Autocoders/Python/src/fprime_ac/generators/visitors/SerializableVisitor.py b/Autocoders/Python/src/fprime_ac/generators/visitors/SerializableVisitor.py index 4b6d2584c9..e4b6b95aad 100644 --- a/Autocoders/Python/src/fprime_ac/generators/visitors/SerializableVisitor.py +++ b/Autocoders/Python/src/fprime_ac/generators/visitors/SerializableVisitor.py @@ -107,7 +107,7 @@ def _get_conv_mem_list(self, obj): """ Return a list of port argument tuples """ - arg_list = list() + arg_list = [] for (name, mtype, size, format, comment) in obj.get_members(): typeinfo = None @@ -227,7 +227,7 @@ def publicVisit(self, obj): """ c = SerialBody.SerialBody() c.name = obj.get_name() - c.mem_list = list() + c.mem_list = [] for (n, t, s, f, comment) in obj.get_members(): # convert XML types to Python classes ( diff --git a/Autocoders/Python/src/fprime_ac/generators/writers/ComponentWriterBase.py b/Autocoders/Python/src/fprime_ac/generators/writers/ComponentWriterBase.py index dd01a621b7..a153ec48fe 100644 --- a/Autocoders/Python/src/fprime_ac/generators/writers/ComponentWriterBase.py +++ b/Autocoders/Python/src/fprime_ac/generators/writers/ComponentWriterBase.py @@ -393,7 +393,7 @@ def g(xxx_todo_changeme3): if len(opcodes) == 1: return "CMD_" + mnemonic.upper() else: - mlist = list() + mlist = [] inst = 0 for opcode in opcodes: mlist.append("CMD_" + mnemonic.upper() + "_%d" % inst) @@ -452,7 +452,7 @@ def initPortFlags(self, obj, c): c.has_time_get = "TimeGet" in roles def initPortIncludes(self, obj, c): - c.port_includes = list() + c.port_includes = [] for include in self.__model_parser.uniqueList(obj.get_xml_port_files()): include = include.replace("PortAi.xml", "PortAc.hpp") include = include.replace("/test/ut", "") diff --git a/Autocoders/Python/src/fprime_ac/generators/writers/InstCommandWriter.py b/Autocoders/Python/src/fprime_ac/generators/writers/InstCommandWriter.py index c5710c9379..9e64cd7e17 100644 --- a/Autocoders/Python/src/fprime_ac/generators/writers/InstCommandWriter.py +++ b/Autocoders/Python/src/fprime_ac/generators/writers/InstCommandWriter.py @@ -257,8 +257,8 @@ def DictBodyWrite(self, obj, topology_model): c.description = obj.get_comment() c.component = obj.get_component_name() - c.arglist = list() - c.ser_import_list = list() + c.arglist = [] + c.ser_import_list = [] for arg_obj in obj.get_args(): # convert XML types to Python classes @@ -305,8 +305,8 @@ def DictBodyWrite(self, obj, topology_model): c.description = obj.get_comment() c.component = obj.get_component_name() - c.arglist = list() - c.ser_import_list = list() + c.arglist = [] + c.ser_import_list = [] # convert XML types to Python classes ( @@ -347,8 +347,8 @@ def DictBodyWrite(self, obj, topology_model): c.description = obj.get_comment() c.component = obj.get_component_name() - c.arglist = list() - c.ser_import_list = list() + c.arglist = [] + c.ser_import_list = [] self._writeTmpl(c, self.__fp2[fname], "commandBodyWrite") self.__fp2[fname].close() diff --git a/Autocoders/Python/src/fprime_ac/generators/writers/InstEventWriter.py b/Autocoders/Python/src/fprime_ac/generators/writers/InstEventWriter.py index 9532d32379..1344a8ff14 100644 --- a/Autocoders/Python/src/fprime_ac/generators/writers/InstEventWriter.py +++ b/Autocoders/Python/src/fprime_ac/generators/writers/InstEventWriter.py @@ -194,8 +194,8 @@ def DictBodyWrite(self, obj, topology_model): c.description = obj.get_comment() c.component = obj.get_component_name() - c.arglist = list() - c.ser_import_list = list() + c.arglist = [] + c.ser_import_list = [] arg_num = 0 for arg_obj in obj.get_args(): diff --git a/Autocoders/Python/src/fprime_ac/models/ModelParser.py b/Autocoders/Python/src/fprime_ac/models/ModelParser.py index fc52e00246..05e5e55ea8 100644 --- a/Autocoders/Python/src/fprime_ac/models/ModelParser.py +++ b/Autocoders/Python/src/fprime_ac/models/ModelParser.py @@ -189,7 +189,7 @@ def getPortArgsDict(self, obj): for port in obj.get_ports(): name = port.get_name() port_namespace = port.get_namespace() - args_dict[name] = list() + args_dict[name] = [] # print "Port: %s" % name args = port.get_args() for a in args: @@ -492,7 +492,7 @@ def getCommandArgsDict(self, obj, from_proto=False): args_dict = dict() for command in obj.get_commands(): mnemonic = command.get_mnemonic() - args_dict[mnemonic] = list() + args_dict[mnemonic] = [] # print "Command: %s" % name args = command.get_args() @@ -578,7 +578,7 @@ def getEventArgsDict(self, obj): args_dict = dict() for event in obj.get_events(): name = event.get_name() - args_dict[name] = list() + args_dict[name] = [] # print "Command: %s" % name args = event.get_args() @@ -662,7 +662,7 @@ def getInternalInterfaceArgsDict(self, obj, from_proto=False): args_dict = dict() for internal_interface in obj.get_internal_interfaces(): name = internal_interface.get_name() - args_dict[name] = list() + args_dict[name] = [] # print "Interface: %s" % name args = internal_interface.get_args() diff --git a/Autocoders/Python/src/fprime_ac/parsers/XmlComponentParser.py b/Autocoders/Python/src/fprime_ac/parsers/XmlComponentParser.py index 5a4a05c2a3..a8d2578c92 100644 --- a/Autocoders/Python/src/fprime_ac/parsers/XmlComponentParser.py +++ b/Autocoders/Python/src/fprime_ac/parsers/XmlComponentParser.py @@ -291,7 +291,7 @@ def __init__(self, xml_file=None): sys.exit(-1) # convert text bases to integers - opcode_base_list = list() + opcode_base_list = [] for base in opcode_bases: opcode_base_list.append(int(base, base=0)) else: @@ -307,7 +307,7 @@ def __init__(self, xml_file=None): m = command.attrib["mnemonic"] o = command.attrib["opcode"] # check to see if there is a base opcode specified - opcode_list = list() + opcode_list = [] if opcode_bases is not None: # walk through opcode base list for base in opcode_base_list: @@ -427,7 +427,7 @@ def __init__(self, xml_file=None): sys.exit(-1) # convert text bases to integers - telemetry_base_list = list() + telemetry_base_list = [] for base in telemetry_bases: telemetry_base_list.append(int(base, base=0)) else: @@ -442,7 +442,7 @@ def __init__(self, xml_file=None): sys.exit(-1) i = channel.attrib["id"] # check to see if there is a base id specified - id_list = list() + id_list = [] if telemetry_bases is not None: # walk through opcode base list for base in telemetry_base_list: @@ -582,7 +582,7 @@ def __init__(self, xml_file=None): sys.exit(-1) # convert text bases to integers - event_base_list = list() + event_base_list = [] for base in event_bases: event_base_list.append(int(base, base=0)) @@ -598,7 +598,7 @@ def __init__(self, xml_file=None): sys.exit(-1) i = event.attrib["id"] # check to see if there is a base id specified - id_list = list() + id_list = [] if event_bases is not None: # walk through opcode base list for base in event_base_list: @@ -734,14 +734,14 @@ def __init__(self, xml_file=None): sys.exit(-1) # convert text bases to integers - parameter_base_list = list() + parameter_base_list = [] for base in parameter_bases: parameter_base_list.append(int(base, base=0)) else: parameter_bases = None # see if parameter command opcode base is specified - opcode_base_list = list() + opcode_base_list = [] if "opcode_base" in list(comp_tag.attrib.keys()): opcode_base = self.__eval_var( constants_file, "Component", comp_tag.attrib["opcode_base"] @@ -773,7 +773,7 @@ def __init__(self, xml_file=None): sys.exit(-1) i = parameter.attrib["id"] # check to see if there is a base id specified - parameter_id_list = list() + parameter_id_list = [] if parameter_bases is not None: for base in parameter_base_list: parameter_id_list.append("0x%X" % (int(i, base=0) + base)) @@ -784,7 +784,7 @@ def __init__(self, xml_file=None): d = parameter.attrib["data_type"] setop = parameter.attrib["set_opcode"] - set_opcode_list = list() + set_opcode_list = [] if opcode_bases is not None: # walk through opcode base list for base in opcode_base_list: @@ -793,7 +793,7 @@ def __init__(self, xml_file=None): set_opcode_list.append(setop) saveop = parameter.attrib["save_opcode"] - save_opcode_list = list() + save_opcode_list = [] if opcode_bases is not None: # walk through opcode base list for base in opcode_base_list: @@ -1640,7 +1640,7 @@ def __init__( self.__limits = limits self.__comment = comment # A list of unit conversions for each channel - self.__units = list() + self.__units = [] def get_ids(self): return self.__ids diff --git a/Autocoders/Python/src/fprime_ac/utils/ConfigManager.py b/Autocoders/Python/src/fprime_ac/utils/ConfigManager.py index 40c6c0a673..1d5e16adce 100644 --- a/Autocoders/Python/src/fprime_ac/utils/ConfigManager.py +++ b/Autocoders/Python/src/fprime_ac/utils/ConfigManager.py @@ -47,7 +47,7 @@ def __init__(self): # the users $HOME directory. If not found # then the default values from setProps are used. config_file_name = "ac.ini" - files = list() + files = [] # Append other paths to look in here. # Look in next one, the home directory of the user. diff --git a/Autocoders/Python/src/fprime_ac/utils/EnumDictCheck.py b/Autocoders/Python/src/fprime_ac/utils/EnumDictCheck.py index 23c6f8e0fc..e046e1e240 100644 --- a/Autocoders/Python/src/fprime_ac/utils/EnumDictCheck.py +++ b/Autocoders/Python/src/fprime_ac/utils/EnumDictCheck.py @@ -17,8 +17,8 @@ def __init__(self): # # (overrun_type, bit_length, max_value, signed) - self.overrun_details = list() - self.underrun_details = list() + self.overrun_details = [] + self.underrun_details = [] self.overruns = 0 # not enough uplink bits (error) self.underruns = 0 # too many uplink bits (warning) diff --git a/Autocoders/Python/src/fprime_ac/utils/XmlParser.py b/Autocoders/Python/src/fprime_ac/utils/XmlParser.py index 44132b2c01..6304373662 100644 --- a/Autocoders/Python/src/fprime_ac/utils/XmlParser.py +++ b/Autocoders/Python/src/fprime_ac/utils/XmlParser.py @@ -59,7 +59,7 @@ def __init__(self, xml_file=None): a big string. """ - self.__node_stack = list() + self.__node_stack = [] self.__node_end_visit_dict = dict() self.__node_start_visit_dict = dict() @@ -156,7 +156,7 @@ def parse(self): if self.__xml_string is None: return else: - self.__node_stack = list() + self.__node_stack = [] for token, content, loc in XML(self.__xml_string): @@ -311,7 +311,7 @@ def validateElement(self, element, validAttrs): problems = 0 value = dict() - invalidAttrs = list() + invalidAttrs = [] errorMsg = "Error: XML element <%s> is invalid" % (element.getName()) @@ -359,7 +359,7 @@ def countSubtree(self, element, expectedChildren): methods). """ found = dict() - unexpectedChildren = list() + unexpectedChildren = [] errMsg = "Error: The XML element <%s> is invalid" % (element.getName()) children = element.getElements() @@ -482,7 +482,7 @@ def getElements(self, name=""): if not name: return self.children else: - elements = list() + elements = [] for element in self.children: if element.name == name: elements.append(element) diff --git a/Autocoders/Python/src/fprime_ac/utils/pyparsing.py b/Autocoders/Python/src/fprime_ac/utils/pyparsing.py index b0404112b3..da88992ae0 100644 --- a/Autocoders/Python/src/fprime_ac/utils/pyparsing.py +++ b/Autocoders/Python/src/fprime_ac/utils/pyparsing.py @@ -591,7 +591,7 @@ def setDefaultWhitespaceChars(chars): setDefaultWhitespaceChars = staticmethod(setDefaultWhitespaceChars) def __init__(self, savelist=False): - self.parseAction = list() + self.parseAction = [] self.failAction = None # ~ self.name = "" # don't define self.name, let subclasses try/except upcall self.strRepr = None @@ -602,7 +602,7 @@ def __init__(self, savelist=False): self.copyDefaultWhiteChars = True self.mayReturnEmpty = False self.keepTabs = False - self.ignoreExprs = list() + self.ignoreExprs = [] self.debug = False self.streamlined = False self.mayIndexError = True