From beaf4ccb717a27eb5e843664df2d2637fdb7e8dc Mon Sep 17 00:00:00 2001 From: Roy-043 Date: Wed, 9 Aug 2023 09:30:54 +0200 Subject: [PATCH] Import: Avoid dictionary.keys() where possible --- src/Mod/Import/App/SCL/Part21.py | 6 +++--- src/Mod/Import/App/SCL/SimpleReader.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Mod/Import/App/SCL/Part21.py b/src/Mod/Import/App/SCL/Part21.py index f2d1ac921a..f116305dd7 100644 --- a/src/Mod/Import/App/SCL/Part21.py +++ b/src/Mod/Import/App/SCL/Part21.py @@ -120,7 +120,7 @@ class Part21Parser: return self._schema_name def get_number_of_instances(self): - return len(list(self._instances_definition.keys())) + return len(self._instances_definition) def parse_file(self): init_time = time.time() @@ -153,7 +153,7 @@ class Part21Parser: self._schema_name = line.split("'")[1].split("'")[0].split(" ")[0].lower() fp.close() print('done in %fs.'%(time.time()-init_time)) - print('schema: - %s entities %i'%(self._schema_name,len(list(self._instances_definition.keys())))) + print('schema: - %s entities %i'%(self._schema_name,len(self._instances_definition))) class EntityInstancesFactory(object): ''' @@ -183,7 +183,7 @@ class Part21Population(object): def create_entity_instances(self): """ Starts entity instances creation """ - for number_of_ancestor in list(self._part21_loader._number_of_ancestors.keys()): + for number_of_ancestor in list(self._part21_loader._number_of_ancestors): for entity_definition_id in self._part21_loader._number_of_ancestors[number_of_ancestor]: self.create_entity_instance(entity_definition_id) diff --git a/src/Mod/Import/App/SCL/SimpleReader.py b/src/Mod/Import/App/SCL/SimpleReader.py index 8061354f2a..0df392b55c 100644 --- a/src/Mod/Import/App/SCL/SimpleReader.py +++ b/src/Mod/Import/App/SCL/SimpleReader.py @@ -81,7 +81,7 @@ class SimpleParser: gvFile = open(fileName,'w') gvFile.write('digraph G {\n node [fontname=Verdana,fontsize=12]\n node [style=filled]\n node [fillcolor="#EEEEEE"]\n node [color="#EEEEEE"]\n edge [color="#31CEF0"]\n') - for i in list(self._p21loader._instances_definition.keys()): + for i in list(self._p21loader._instances_definition): entityStr = '#'+repr(i) nameStr = self._p21loader._instances_definition[i][0].lower() sttrStr = repr(self._p21loader._instances_definition[i][1]).replace('"','').replace("'",'').replace(" ",'') @@ -105,7 +105,7 @@ class SimpleParser: if self.schemaModule: self.schemaClasses = dict(inspect.getmembers(self.schemaModule)) - for i in list(self._p21loader._instances_definition.keys()): + for i in list(self._p21loader._instances_definition): #print i if i not in self.instanceMape: self._create_entity_instance(i)